diff options
author | click <none@none> | 2010-08-09 23:14:16 +0200 |
---|---|---|
committer | click <none@none> | 2010-08-09 23:14:16 +0200 |
commit | 816acb11a46c39e678efe8012e0ac12c32cd271b (patch) | |
tree | 21796f19a54aadf5c6f3623b4358d35fc5261cbf /src | |
parent | 5709c8be0d88a134a25ca28d1cc77203d7666799 (diff) |
BuilSystem: Clean up some small but annoying things from my earlier commits:
- return to using default CMake buildconfiguration (release, relwithdebinfo, debug, minsizerel
Note: These are not yet populated as buildmodes : relwithdebinfo / minsizerel (will be created later)
- change it so that genrev creates revision.h properly (after genrev has been compiled successfully)
- split scripts/game PCH creation depending on which part a user wants to compile (default on) (thanks shauren)
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/genrevision/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/server/game/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/server/scripts/CMakeLists.txt | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/genrevision/CMakeLists.txt b/src/genrevision/CMakeLists.txt index 5e8a002b25d..06f7a6c4bd7 100644 --- a/src/genrevision/CMakeLists.txt +++ b/src/genrevision/CMakeLists.txt @@ -16,15 +16,16 @@ add_executable(genrev ) if( CMAKE_GENERATOR MATCHES "Visual Studio" ) - add_custom_command(TARGET genrev ALL + add_custom_command(TARGET genrev POST_BUILD COMMAND ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/genrev ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) else() - add_custom_command(TARGET genrev ALL + add_custom_command(TARGET genrev + POST_BUILD COMMAND ${CMAKE_BINARY_DIR}/src/genrevision/genrev ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) endif() diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 5b67fabc510..3ab856cfb97 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -8,10 +8,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -######## game ######## - -# Enable precompiled headers when using the GCC compiler. -if(PCH) +if( GAMEPCH ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -195,7 +192,7 @@ add_library(game STATIC ${game_STAT_SRCS}) add_dependencies(game genrev) # Generate precompiled header -if(PCH) +if( GAMEPCH ) if(CMAKE_COMPILER_IS_GNUCXX) add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH.h) elseif(MSVC) diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 792f6c81bfe..ae9ba964eca 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -18,7 +18,7 @@ file(GLOB_RECURSE scripts_examples Examples/*.cpp Examples/*.h) file(GLOB_RECURSE scripts_outdoorpvp OutdoorPvP/*.cpp OutdoorPvP/*.h) # Enable precompiled headers when using the GCC compiler. -if(PCH) +if( SCRIPTPCH ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) @@ -142,7 +142,7 @@ add_library(scripts STATIC ${scripts_STAT_SRCS}) add_dependencies(scripts genrev) # Generate precompiled header -if(PCH) +if( SCRIPTPCH ) if(CMAKE_COMPILER_IS_GNUCXX) add_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders/ScriptPCH.h) elseif(MSVC) |