mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-23 17:38:44 +00:00
Changed: #880 Use PCH under Linux with CMake
This commit is contained in:
parent
4245138d8d
commit
3066c37bee
1 changed files with 6 additions and 4 deletions
|
@ -45,9 +45,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
||||||
IF(${_targetType} STREQUAL SHARED_LIBRARY)
|
IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
|
||||||
LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC")
|
LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC")
|
||||||
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
|
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
|
||||||
|
|
||||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
## TODO ... ? or does it work out of the box
|
## TODO ... ? or does it work out of the box
|
||||||
|
@ -59,8 +59,10 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
|
||||||
ENDFOREACH(item)
|
ENDFOREACH(item)
|
||||||
|
|
||||||
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
|
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
|
||||||
#MESSAGE("_directory_flags ${_directory_flags}" )
|
GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
|
||||||
|
#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
|
||||||
LIST(APPEND ${_out_compile_flags} ${_directory_flags})
|
LIST(APPEND ${_out_compile_flags} ${_directory_flags})
|
||||||
|
LIST(APPEND ${_out_compile_flags} ${_global_definitions})
|
||||||
LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
|
LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
|
||||||
|
|
||||||
SEPARATE_ARGUMENTS(${_out_compile_flags})
|
SEPARATE_ARGUMENTS(${_out_compile_flags})
|
||||||
|
@ -202,7 +204,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
|
||||||
_PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx)
|
_PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx)
|
||||||
|
|
||||||
IF(${_targetType} STREQUAL SHARED_LIBRARY)
|
IF(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||||
ADD_LIBRARY(${_targetName}_pch_dephelp SHARED ${_pch_dephelp_cxx} )
|
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx} )
|
||||||
ELSE(${_targetType} STREQUAL SHARED_LIBRARY)
|
ELSE(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||||
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx})
|
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx})
|
||||||
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
|
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
|
||||||
|
|
Loading…
Reference in a new issue