Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build process for Windows 10

Browse Source
This commit is contained in:
Stefan Ritt 2019-11-27 15:49:00 +01:00
parent 18b0d54cf4
commit d05ee3d313
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -19,8 +19,11 @@ set(SRVDIR /usr/lib/systemd/system)
include_directories(${CMAKE_SOURCE_DIR}/mxml)
# default compiler flags
if (!WIN32)
add_compile_options(-W -Wall -Wno-deprecated-declarations)
if (!MSVC)
add_compile_options(-W -Wall -Wno-deprecated-declarations)
endif()
if (MSVC)
add_compile_options(/D_CRT_SECURE_WARNINGS /wd4005 /wd4244 /wd4267 /wd4996 /nologo)
endif()
# find git
@ -63,21 +66,23 @@ if (USE_PAM)
include_directories(${PAM_INCLUDE_DIR})
endif (USE_PAM)
# execute_process(COMMAND git log -n 1 --pretty=format:"%ad - %h" OUTPUT_VARIABLE GIT_REV)
# configure_file( ${GIT_REVISION}.in ${GIT_REVISION} )
set(GIT_REVISION_TMP ${GIT_REVISION}.tmp)
if (WIN32)
add_custom_target(git_revision_h
COMMAND ${CMAKE_COMMAND} -E echo_append "\\#define GIT_REVISION \\\"" > ${GIT_REVISION_TMP}
COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%ad" >> ${GIT_REVISION_TMP}
COMMAND ${CMAKE_COMMAND} -E echo_append " - " >> ${GIT_REVISION_TMP}
COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h" >> ${GIT_REVISION_TMP}
COMMAND ${CMAKE_COMMAND} -E echo \\\" >> ${GIT_REVISION_TMP}
COMMAND ${CMAKE_SOURCE_DIR}/makegit.bat
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_REVISION_TMP} ${GIT_REVISION}
COMMAND ${CMAKE_COMMAND} -E remove ${GIT_REVISION_TMP}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/
)
else(WIN32)
add_custom_target(git_revision_h
COMMAND ${CMAKE_SOURCE_DIR}/makegit
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_REVISION_TMP} ${GIT_REVISION}
COMMAND ${CMAKE_COMMAND} -E remove ${GIT_REVISION_TMP}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/
)
endif()
add_executable(elogd
${CMAKE_SOURCE_DIR}/src/elogd.c
@ -111,6 +116,11 @@ if(USE_PAM)
target_link_libraries(elogd ${PAM_LIBRARIES})
endif(USE_PAM)
if (WIN32)
target_link_libraries(elogd wsock32 ws2_32)
target_link_libraries(elog wsock32 ws2_32)
endif()
install(TARGETS elog
DESTINATION bin)
install(FILES ${CMAKE_SOURCE_DIR}/man/elog.1

2
makegit.bat
View File

@ -1 +1 @@
/cygwin/bin/sh -c /cygdrive/c/elog/makegit > c:\elog\src\git-revision.h
/cygwin64/bin/sh -c /cygdrive/c/Users/ritt/Documents/elog/makegit > c:\Users\ritt\Documents\elog\src\git-revision.h.tmp