generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2024-12-13 10:42:56 +01:00
Code Issues Projects Releases Wiki Activity

MinGW / Windows fixes (#260)

Browse Source 
* Add MINGW_HAS_SECURE_API flag for mingw compiler

* Use cmd rather than powershell to get GIT_VERSION on windows

powershell causes cmake to hang
This commit is contained in:
Thomas Khyn 2018-04-23 04:26:28 +12:00 committed by Kjell Hedström
parent 7f25b004cf
commit b6220b9174
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -74,7 +74,7 @@ SET(MAJOR_VERSION 1)
IF ( NOT VERSION )
IF ( "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows" )
message("windows: Extracting git software version")
execute_process(COMMAND powershell "(git rev-list --branches HEAD | Measure-Object -line).Lines" OUTPUT_VARIABLE GIT_VERSION WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
execute_process(COMMAND cmd /c "git rev-list --branches HEAD | find /v "" /c" OUTPUT_VARIABLE GIT_VERSION WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
ELSE()
IF(UNIX OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
message( STATUS "nix: Extracting git software version" )
@ -186,6 +186,9 @@ IF(MINGW)
#
# ==========================================================================
INCLUDE (${g3log_SOURCE_DIR}/CPackLists.txt)
# this enables strerror_s
ADD_DEFINITIONS(-DMINGW_HAS_SECURE_API)
ENDIF()
IF (NOT MSVC)