diff options
| -rw-r--r-- | dep/cotire/CMake/cotire.cmake | 16 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 7 |
2 files changed, 16 insertions, 7 deletions
diff --git a/dep/cotire/CMake/cotire.cmake b/dep/cotire/CMake/cotire.cmake index b2c2d391142..e2025e86575 100644 --- a/dep/cotire/CMake/cotire.cmake +++ b/dep/cotire/CMake/cotire.cmake @@ -2341,7 +2341,7 @@ function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefix endif() endfunction() -function (cotire_setup_prefix_file_inclusion _language _target _prefixFile) +function (cotire_setup_prefix_file_inclusion _language _target _prefixFile _prefixFileWasGenerated) set (_sourceFiles ${ARGN}) # force the inclusion of the prefix header for the given source files set (_flags "") @@ -2352,8 +2352,10 @@ function (cotire_setup_prefix_file_inclusion _language _target _prefixFile) set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ") # mark sources as cotired to prevent them from being used in another cotired target set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}") - # make object files generated from source files depend on prefix header - set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}") + if (_prefixFileWasGenerated) + # make object files generated from source files depend on prefix header + set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}") + endif() endfunction() function (cotire_get_first_set_property_value _propertyValueVar _type _object) @@ -2866,6 +2868,7 @@ function (cotire_process_target_language _language _configurations _target _whol if (_prefixFile) # check for user provided prefix header files get_property(_prefixHeaderFiles TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT) + set (_prefixFileWasGenerated TRUE) if (_prefixHeaderFiles) list (LENGTH _prefixHeaderFiles _numberOfprefixHeaderFiles) # if there is only one header specified in COTIRE_${_language}_PREFIX_HEADER_INIT then use it directly @@ -2873,11 +2876,12 @@ function (cotire_process_target_language _language _configurations _target _whol # even if only one source file changed # custom commands in cmake are designed to be always "out of date" so generation always happens # Visual Studio determines "out of date" status by last modification timestamp, not content - if (_numberOfprefixHeaderFiles GREATER 1) + if (_numberOfprefixHeaderFiles GREATER 1 OR NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") cotire_setup_prefix_generation_from_provided_command( ${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" _cmds ${_prefixHeaderFiles}) else() list (GET _prefixHeaderFiles 0 _prefixFile) + set (_prefixFileWasGenerated FALSE) endif() else() cotire_setup_prefix_generation_from_unity_command( @@ -2901,7 +2905,7 @@ function (cotire_process_target_language _language _configurations _target _whol endif() elseif (_prefixHeaderFiles) # user provided prefix header must be included unconditionally - cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_sourceFiles}) + cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_prefixFileWasGenerated} ${_sourceFiles}) endif() endif() # mark target as cotired for language @@ -3005,7 +3009,7 @@ function (cotire_setup_unity_target_pch_usage _languages _target) get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER) if (_userPrefixFile AND _prefixFile) # user provided prefix header must be included unconditionally by unity sources - cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_unityFiles}) + cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" TRUE ${_unityFiles}) endif() endif() endforeach() diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 661d3fb7df1..03be9362573 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -166,6 +166,11 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) trinity-core-interface PUBLIC game) + + target_include_directories(${SCRIPT_MODULE_PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}) + set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} PROPERTIES FOLDER @@ -221,7 +226,7 @@ set_target_properties(scripts # Generate precompiled header if (USE_SCRIPTPCH) list(APPEND ALL_SCRIPT_PROJECTS scripts ${DYNAMIC_SCRIPT_MODULE_PROJECTS}) - add_cxx_pch("${ALL_SCRIPT_PROJECTS}" ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch("${ALL_SCRIPT_PROJECTS}" ${PRIVATE_PCH_HEADER}) endif() # Remove all shared libraries in the installl directory which |