mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Changed: Define new variables for VC++ 2015
--HG-- branch : develop
This commit is contained in:
parent
3efe3ab1c1
commit
6c09626fde
1 changed files with 10 additions and 2 deletions
|
@ -55,7 +55,15 @@ MACRO(DETECT_EXPRESS_VERSION _VERSION)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDMACRO()
|
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")
|
DETECT_VC_VERSION("12.0")
|
||||||
SET(MSVC_TOOLSET "120")
|
SET(MSVC_TOOLSET "120")
|
||||||
|
|
||||||
|
@ -98,7 +106,7 @@ IF(NOT VC_DIR)
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(_COMPILER ${CMAKE_C_COMPILER})
|
SET(_COMPILER ${CMAKE_C_COMPILER})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${_COMPILER})
|
STRING(REGEX REPLACE "/(bin|BIN|Bin)/.+" "" VC_DIR ${_COMPILER})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
|
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
|
||||||
|
|
Loading…
Reference in a new issue