Buildsystem: Update CMakeLists to use the proper check, not the old one...
--HG-- branch : trunk
This commit is contained in:
@@ -15,11 +15,11 @@ file(GLOB_RECURSE sources_realms Realms/*.cpp Realms/*.h)
|
||||
file(GLOB_RECURSE sources_server Server/*.cpp Server/*.h)
|
||||
file(GLOB sources_localdir *.cpp *.h)
|
||||
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
if ( GAMEPCH AND MSVC )
|
||||
if ( USE_COREPCH AND MSVC )
|
||||
set(authserver_SRCS
|
||||
PrecompiledHeaders/authPCH.cpp
|
||||
PrecompiledHeaders/authPCH.h
|
||||
@@ -118,7 +118,7 @@ elseif( WIN32 )
|
||||
endif()
|
||||
|
||||
# Generate precompiled header
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(authserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/authPCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
@@ -17,7 +17,7 @@ file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h)
|
||||
file(GLOB_RECURSE sources_Models Models/*.cpp Models/*.h)
|
||||
file(GLOB sources_localdir *.cpp *.h)
|
||||
|
||||
if( GAMEPCH AND MSVC )
|
||||
if( USE_COREPCH AND MSVC )
|
||||
set(collision_STAT_SRCS
|
||||
PrecompiledHeaders/collisionPCH.cpp
|
||||
PrecompiledHeaders/collisionPCH.h
|
||||
@@ -54,7 +54,7 @@ include_directories(
|
||||
add_library(collision STATIC ${collision_STAT_SRCS})
|
||||
|
||||
# Generate precompiled header
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(collision ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/collisionPCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
@@ -50,7 +50,7 @@ file(GLOB_RECURSE sources_World World/*.cpp World/*.h)
|
||||
|
||||
# Create game-libary
|
||||
|
||||
if( GAMEPCH AND MSVC )
|
||||
if( USE_COREPCH AND MSVC )
|
||||
set(game_STAT_SRCS
|
||||
PrecompiledHeaders/gamePCH.cpp
|
||||
PrecompiledHeaders/gamePCH.h
|
||||
@@ -194,7 +194,7 @@ add_library(game STATIC ${game_STAT_SRCS})
|
||||
add_dependencies(game genrev)
|
||||
|
||||
# Generate precompiled header
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(game ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/gamePCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
@@ -18,13 +18,13 @@ 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( SCRIPTPCH )
|
||||
if( USE_SCRIPTPCH )
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
endif()
|
||||
|
||||
if( SCRIPTPCH AND MSVC )
|
||||
if( USE_SCRIPTPCH AND MSVC )
|
||||
set(scripts_STAT_SRCS
|
||||
PrecompiledHeaders/ScriptPCH.cpp
|
||||
PrecompiledHeaders/ScriptPCH.h
|
||||
@@ -145,7 +145,7 @@ add_library(scripts STATIC ${scripts_STAT_SRCS})
|
||||
add_dependencies(scripts genrev)
|
||||
|
||||
# Generate precompiled header
|
||||
if( SCRIPTPCH )
|
||||
if( USE_SCRIPTPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(scripts ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/ScriptPCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
@@ -28,7 +28,7 @@ file(GLOB sources_localdir *.cpp *.h)
|
||||
# Build shared sourcelist
|
||||
#
|
||||
|
||||
if( GAMEPCH AND MSVC )
|
||||
if( USE_COREPCH AND MSVC )
|
||||
set(shared_STAT_SRCS
|
||||
PrecompiledHeaders/sharedPCH.cpp
|
||||
PrecompiledHeaders/sharedPCH.h
|
||||
@@ -89,7 +89,7 @@ else()
|
||||
endif()
|
||||
|
||||
# Generate precompiled header
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(shared ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/sharedPCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
@@ -14,11 +14,11 @@ file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h)
|
||||
file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h)
|
||||
file(GLOB sources_localdir *.cpp *.h)
|
||||
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
if ( GAMEPCH AND MSVC )
|
||||
if ( USE_COREPCH AND MSVC )
|
||||
set(worldserver_SRCS
|
||||
PrecompiledHeaders/worldPCH.cpp
|
||||
PrecompiledHeaders/worldPCH.h
|
||||
@@ -220,7 +220,7 @@ elseif( WIN32 )
|
||||
endif()
|
||||
|
||||
# Generate precompiled header
|
||||
if( GAMEPCH )
|
||||
if( USE_COREPCH )
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
add_precompiled_header(worldserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/worldPCH.h)
|
||||
elseif(MSVC)
|
||||
|
||||
Reference in New Issue
Block a user