mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-09 16:59:01 +00:00
Merge with develop
This commit is contained in:
parent
485c4721bc
commit
a11e74f18e
2 changed files with 13 additions and 5 deletions
|
@ -55,7 +55,15 @@ MACRO(DETECT_EXPRESS_VERSION _VERSION)
|
|||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
IF(MSVC12)
|
||||
IF(MSVC14)
|
||||
DETECT_VC_VERSION("14.0")
|
||||
SET(MSVC_TOOLSET "140")
|
||||
|
||||
IF(NOT MSVC14_REDIST_DIR)
|
||||
# If you have VC++ 2015 Express, put x64/Microsoft.VC140.CRT/*.dll in ${EXTERNAL_PATH}/redist
|
||||
SET(MSVC14_REDIST_DIR "${EXTERNAL_PATH}/redist")
|
||||
ENDIF()
|
||||
ELSEIF(MSVC12)
|
||||
DETECT_VC_VERSION("12.0")
|
||||
SET(MSVC_TOOLSET "120")
|
||||
|
||||
|
@ -98,7 +106,7 @@ IF(NOT VC_DIR)
|
|||
ELSE()
|
||||
SET(_COMPILER ${CMAKE_C_COMPILER})
|
||||
ENDIF()
|
||||
STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${_COMPILER})
|
||||
STRING(REGEX REPLACE "/(bin|BIN|Bin)/.+" "" VC_DIR ${_COMPILER})
|
||||
ENDIF()
|
||||
|
||||
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
|
||||
|
|
|
@ -60,12 +60,12 @@ IF(Mercurial_HG_EXECUTABLE)
|
|||
EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} --version
|
||||
OUTPUT_VARIABLE Mercurial_VERSION_HG
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
|
||||
STRING(REGEX REPLACE ".*version ([\\.0-9]+).*"
|
||||
"\\1" Mercurial_VERSION_HG "${Mercurial_VERSION_HG}")
|
||||
|
||||
MACRO(Mercurial_WC_INFO dir prefix)
|
||||
EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} tip --template "{rev};{node};{tags};{author}"
|
||||
EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} log -r . --template "{rev};{node};{tags};{author}"
|
||||
WORKING_DIRECTORY ${dir}
|
||||
OUTPUT_VARIABLE ${prefix}_WC_INFO
|
||||
ERROR_VARIABLE Mercurial_hg_info_error
|
||||
|
@ -73,7 +73,7 @@ IF(Mercurial_HG_EXECUTABLE)
|
|||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
IF(NOT ${Mercurial_hg_info_result} EQUAL 0)
|
||||
MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} tip\" failed with output:\n${Mercurial_hg_info_error}")
|
||||
MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} log\" failed with output:\n${Mercurial_hg_info_error}")
|
||||
ELSE()
|
||||
LIST(LENGTH ${prefix}_WC_INFO _COUNT)
|
||||
IF(_COUNT EQUAL 4)
|
||||
|
|
Loading…
Reference in a new issue