From 347f87590e8f1458c3b9ec902d05c8b76d3dc398 Mon Sep 17 00:00:00 2001 From: ShelbyZ Date: Tue, 6 Mar 2018 21:49:01 -0800 Subject: [PATCH] Fix some weirdness with cotire - cotire having unresolved externals with sapphire_zone/scripts build - /MP was already enabled, so remove the duplicate - still need to figure out what about pch causes unresolved symbol __ --- cmake/compiler.cmake | 4 ---- src/servers/sapphire_zone/CMakeLists.txt | 2 +- src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake index 20bab671..ebf42d84 100644 --- a/cmake/compiler.cmake +++ b/cmake/compiler.cmake @@ -21,10 +21,6 @@ else() # incremental linking message(STATUS "Enabling Incremental Linking..") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL") - - # enable building with multiple processes - message(STATUS "Enabling Build with Multiple Processes..") - add_definitions(/MP) endif() endif() diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index d342233c..3d9022d9 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -70,4 +70,4 @@ target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script/Scripts" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" ) -cotire( sapphire_zone ) +#cotire( sapphire_zone ) diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt index 2647b366..717550c5 100644 --- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt +++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt @@ -65,7 +65,7 @@ foreach(_scriptDir ${children}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp") - cotire("script_${_name}") + #cotire("script_${_name}") if(MSVC) add_custom_command(TARGET "script_${_name}" POST_BUILD