#4066 System : Improve cmake macros for cotire

This commit is contained in:
Magne Sjaastad
2019-02-11 07:13:08 +01:00
parent 06feb039fc
commit 288ee59587
20 changed files with 114 additions and 39 deletions

View File

@@ -419,6 +419,10 @@ if(RESINSIGHT_ENABLE_COTIRE)
set_source_files_properties (${fileToExclude} PROPERTIES COTIRE_EXCLUDED TRUE)
endforeach(fileToExclude)
foreach (cppFile ${CAF_COTIRE_START_NEW_UNITY_SOURCES})
set_source_files_properties (${cppFile} PROPERTIES COTIRE_START_NEW_UNITY_SOURCE TRUE)
endforeach(cppFile ${CAF_COTIRE_START_NEW_UNITY_SOURCES})
# disable precompiled headers
set_target_properties(ResInsight PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)

View File

@@ -32,3 +32,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h
source_group( "CommandFeature\\AnnotationCommands" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )
# cotire
caf_cotire_start_unity_at_first_item(SOURCE_GROUP_SOURCE_FILES)
list(APPEND CAF_COTIRE_START_NEW_UNITY_SOURCES
${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.cpp
)

View File

@@ -51,3 +51,6 @@ ${QT_MOC_HEADERS}
source_group( "CommandFeature\\Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )
# cotire
caf_cotire_start_unity_at_first_item(SOURCE_GROUP_SOURCE_FILES)

View File

@@ -37,3 +37,6 @@ ${SOURCE_GROUP_SOURCE_FILES}
)
source_group( "CommandFeature\\Completion" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )
# cotire
caf_cotire_start_unity_at_first_item(SOURCE_GROUP_SOURCE_FILES)

View File

@@ -54,6 +54,7 @@ target_link_libraries( ${PROJECT_NAME}
source_group("" FILES ${PROJECT_FILES})
if (COMMAND ri_apply_cotire)
ri_apply_cotire()
# cotire
if (COMMAND caf_apply_cotire)
caf_apply_cotire("${PROJECT_NAME}")
endif()

View File

@@ -93,6 +93,7 @@ target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore
source_group("" FILES ${PROJECT_FILES})
if (COMMAND ri_apply_cotire)
ri_apply_cotire()
# cotire
if (COMMAND caf_apply_cotire)
caf_apply_cotire("${PROJECT_NAME}")
endif()

View File

@@ -24,6 +24,7 @@ target_link_libraries(${PROJECT_NAME} LibCore)
source_group("" FILES ${PROJECT_FILES})
if (COMMAND ri_apply_cotire)
ri_apply_cotire()
# cotire
if (COMMAND caf_apply_cotire)
caf_apply_cotire("${PROJECT_NAME}")
endif()