From c8963653b0c2f9ec394af03d18057cb34cf6d254 Mon Sep 17 00:00:00 2001 From: Maru Date: Fri, 16 Mar 2018 19:11:25 -0300 Subject: [PATCH 1/5] Cotire flag --- CMakeLists.txt | 7 ++++++- src/servers/Scripts/CMakeLists.txt | 10 ++++++++-- src/servers/sapphire_lobby/CMakeLists.txt | 6 +++++- src/servers/sapphire_zone/CMakeLists.txt | 3 ++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fb79881..b1632ce0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,8 @@ set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +set(Cotire_ENABLED TRUE) + ########################################################################## # Boost stuff @@ -30,7 +32,10 @@ set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" ) include( "cmake/boost.cmake" ) include( "cmake/mysql.cmake" ) include( "cmake/compiler.cmake" ) -include( "cmake/cotire.cmake" ) + +if(Cotire_ENABLED) + include( "cmake/cotire.cmake" ) +endif() ############################## # Git # ############################## diff --git a/src/servers/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt index 5f938985..ac343662 100644 --- a/src/servers/Scripts/CMakeLists.txt +++ b/src/servers/Scripts/CMakeLists.txt @@ -12,6 +12,11 @@ set(RUNTIME_OUTPUT_DIRECTORY "${SCRIPT_LIB_DIR}") file(GLOB children "${CMAKE_CURRENT_SOURCE_DIR}/*" ) + +if(Cotire_ENABLED) + message( "Cotire enabled for scripts" ) +endif() + foreach(_scriptDir ${children}) get_filename_component(_name "${_scriptDir}" NAME_WE) if(IS_DIRECTORY ${_scriptDir} AND NOT ${_name} MATCHES "CMakeFiles") @@ -57,8 +62,9 @@ foreach(_scriptDir ${children}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp") - cotire("script_${_name}") - + if( Cotire_ENABLED ) + cotire("script_${_name}") + endif() if(MSVC) add_custom_command(TARGET "script_${_name}" POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp" diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt index f937d857..554d6489 100644 --- a/src/servers/sapphire_lobby/CMakeLists.txt +++ b/src/servers/sapphire_lobby/CMakeLists.txt @@ -27,4 +27,8 @@ else() endif() target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) -cotire( sapphire_lobby ) + +if(Cotire_ENABLED) + message( "Cotire enabled for sapphire_lobby" ) + cotire( sapphire_lobby ) +endif() diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index 9e4e7c0c..ae2e0661 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -67,6 +67,7 @@ target_link_libraries( sapphire_zone ${Boost_LIBRARIES} ) 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}/../../libraries/external" ) -if (UNIX) +if (UNIX AND Cotire_ENABLED) + message( "Cotire enabled for sapphire_zone" ) cotire( sapphire_zone ) endif() From 2eb1aed8bb9e95f127ee8590c805abc4f050f7b5 Mon Sep 17 00:00:00 2001 From: Maru Date: Fri, 16 Mar 2018 19:12:07 -0300 Subject: [PATCH 2/5] Submodule flags --- src/libraries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries b/src/libraries index 67b949df..f2952754 160000 --- a/src/libraries +++ b/src/libraries @@ -1 +1 @@ -Subproject commit 67b949dfe3ffbbba7963b0861670ab4bb1819991 +Subproject commit f295275485c2aa77c3680c18d4e73539f639a7a7 From 9ea48e25240198537ab0c61e70d347daa4fad9e3 Mon Sep 17 00:00:00 2001 From: Maru Date: Fri, 16 Mar 2018 19:24:54 -0300 Subject: [PATCH 3/5] Small fix --- src/libraries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries b/src/libraries index f2952754..2358441c 160000 --- a/src/libraries +++ b/src/libraries @@ -1 +1 @@ -Subproject commit f295275485c2aa77c3680c18d4e73539f639a7a7 +Subproject commit 2358441ce608599b57ef1beaf9c5283cf8bb059c From 01249a69d0dc6dafa9edd83c423ef7e768e70cd1 Mon Sep 17 00:00:00 2001 From: Maru Date: Fri, 16 Mar 2018 19:28:31 -0300 Subject: [PATCH 4/5] No need for messages --- src/servers/Scripts/CMakeLists.txt | 4 ---- src/servers/sapphire_lobby/CMakeLists.txt | 1 - src/servers/sapphire_zone/CMakeLists.txt | 1 - 3 files changed, 6 deletions(-) diff --git a/src/servers/Scripts/CMakeLists.txt b/src/servers/Scripts/CMakeLists.txt index ac343662..d09622cb 100644 --- a/src/servers/Scripts/CMakeLists.txt +++ b/src/servers/Scripts/CMakeLists.txt @@ -13,10 +13,6 @@ set(RUNTIME_OUTPUT_DIRECTORY "${SCRIPT_LIB_DIR}") file(GLOB children "${CMAKE_CURRENT_SOURCE_DIR}/*" ) -if(Cotire_ENABLED) - message( "Cotire enabled for scripts" ) -endif() - foreach(_scriptDir ${children}) get_filename_component(_name "${_scriptDir}" NAME_WE) if(IS_DIRECTORY ${_scriptDir} AND NOT ${_name} MATCHES "CMakeFiles") diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt index 554d6489..b2171acd 100644 --- a/src/servers/sapphire_lobby/CMakeLists.txt +++ b/src/servers/sapphire_lobby/CMakeLists.txt @@ -29,6 +29,5 @@ endif() target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) if(Cotire_ENABLED) - message( "Cotire enabled for sapphire_lobby" ) cotire( sapphire_lobby ) endif() diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index ae2e0661..56eb9075 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -68,6 +68,5 @@ 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}/../../libraries/external" ) if (UNIX AND Cotire_ENABLED) - message( "Cotire enabled for sapphire_zone" ) cotire( sapphire_zone ) endif() From 7a4d5e86fb4095911fb2b7e3174e683d96b7ab2d Mon Sep 17 00:00:00 2001 From: Maru Date: Fri, 16 Mar 2018 19:41:22 -0300 Subject: [PATCH 5/5] Message fix --- src/libraries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries b/src/libraries index 2358441c..4a9d6da5 160000 --- a/src/libraries +++ b/src/libraries @@ -1 +1 @@ -Subproject commit 2358441ce608599b57ef1beaf9c5283cf8bb059c +Subproject commit 4a9d6da513b1bd1f2a50e6780792df0a56120f46