Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: CMake definitions in PCH

Browse source
This commit is contained in:
kervala 2016-12-05 14:04:43 +01:00
parent 7ad66f8ebd
commit b276f39ac8
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/CMakeModules/PCHSupport.cmake
View file

@ -28,15 +28,12 @@ ELSE()
ENDIF() ENDIF()
MACRO(APPEND_DEFINITION _NAME _VAL) MACRO(APPEND_DEFINITION _NAME _VAL)
# value is not empty IF(CMAKE_VERSION VERSION_LESS "2.8.12")
IF(${_VAL}) # don't support logical expressions, append definition
IF(CMAKE_VERSION VERSION_LESS "2.8.12") LIST(APPEND ${_NAME} "-D${_VAL}")
# don't support logical expressions, append definition ELSE()
LIST(APPEND ${_NAME} "-D${_VAL}") # support logical expressions, use them
ELSE() LIST(APPEND ${_NAME} "$<$<BOOL:${_VAL}>:-D$<JOIN:${_VAL},-D>>")
# support logical expressions, use them
LIST(APPEND ${_NAME} "$<$<BOOL:${_VAL}>:-D$<JOIN:${_VAL},-D>>")
ENDIF()
ENDIF() ENDIF()
ENDMACRO() ENDMACRO()
@ -197,7 +194,7 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
LIST(APPEND _FLAGS "${item}") LIST(APPEND _FLAGS "${item}")
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
GET_DIRECTORY_PROPERTY(_DIRECTORY_DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS) GET_DIRECTORY_PROPERTY(_DIRECTORY_DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
IF(_DIRECTORY_DEFINITIONS) IF(_DIRECTORY_DEFINITIONS)