From 5024813fe323eaecbeaca5b150e0d0939a71a3e3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 8 Jun 2017 00:37:15 +0200 Subject: Buildsystem: Minor PCH building changes * *PCH.cpp are now only compiled with MSVC, other compilers use custom helper commands to generate the precompiled header * Don't call the linker for pch helpertargets (cherry picked from commit 137f5e78877ef1b81f4dca68dd43268e325aeeed) --- src/server/scripts/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 021a53a2a5e..9380515196a 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -92,6 +92,9 @@ endforeach() if (USE_SCRIPTPCH) set(PRIVATE_PCH_HEADER ScriptPCH.h) set(PRIVATE_PCH_SOURCE ScriptPCH.cpp) + if (MSVC) + list(INSERT PRIVATE_SOURCES 0 ScriptPCH.cpp) + endif (MSVC) endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -158,9 +161,11 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME) # Add the module name to DYNAMIC_SCRIPT_MODULES list(APPEND DYNAMIC_SCRIPT_MODULE_PROJECTS ${SCRIPT_MODULE_PROJECT_NAME}) + if (USE_SCRIPTPCH) + list(INSERT SCRIPT_MODULE_PRIVATE_SOURCES 0 ScriptPCH.cpp) + endif (USE_SCRIPTPCH) # Create the script module project add_library(${SCRIPT_MODULE_PROJECT_NAME} SHARED - ${PRIVATE_PCH_SOURCE} ${SCRIPT_MODULE_PRIVATE_SOURCES} ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}) target_link_libraries(${SCRIPT_MODULE_PROJECT_NAME} @@ -200,7 +205,6 @@ ConfigureScriptLoader("static" SCRIPT_MODULE_PRIVATE_SCRIPTLOADER OFF ${STATIC_S add_library(scripts STATIC ScriptLoader.h - ${PRIVATE_PCH_SOURCE} ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER} ${PRIVATE_SOURCES}) -- cgit v1.2.3