aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorclick <none@none>2010-09-29 23:42:09 +0200
committerclick <none@none>2010-09-29 23:42:09 +0200
commitb87d8f470042628ac54386853cf877cec107c141 (patch)
tree6fbd34d0adab95f831ade4cb5a630c9478a3d398 /src/server
parentaf660f80ec2a4e8f6687ed8999f4bff75889eef2 (diff)
Buildsystem: Overhaul of the CMake buildsystem:
- utilize CMake for completely generating revision.h (kills off genrev and revision.h targets): - pull and set correct revision-ID/hash from Mercurial (hg) when using regular repository sourcetree - pull and set correct revision-ID/hash from archived releases (when pulled from googlecode) - set and use _BUILD_DIRECTIVE definition (earlier part of revision.h) as compiletime definition - delete genrev and related buildsystems (now deprecated) - Move some files around to adhere to buildsystem structure Thanks to Shauren for figuring out the definition-behaviour for MSVC while he was in the shower --HG-- branch : trunk rename : cmake_uninstall.cmake.in => cmake/platform/unix/cmake_uninstall.in.cmake
Diffstat (limited to 'src/server')
-rw-r--r--src/server/authserver/CMakeLists.txt4
-rw-r--r--src/server/game/CMakeLists.txt2
-rw-r--r--src/server/scripts/CMakeLists.txt2
-rw-r--r--src/server/shared/CMakeLists.txt2
-rw-r--r--src/server/worldserver/CMakeLists.txt4
5 files changed, 2 insertions, 12 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 3a862d607ef..6dbc11b2262 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -68,10 +68,8 @@ add_executable(authserver
${authserver_SRCS}
)
-add_dependencies(authserver revision.h)
-
if( NOT WIN32 )
- add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
+ add_definitions(-D_TRINITY_REALM_CONFIG="${CONF_DIR}/authserver.conf")
endif()
if( UNIX )
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index ffc8c5e49de..16ba912a18a 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -198,8 +198,6 @@ include_directories(
add_library(game STATIC ${game_STAT_SRCS})
-add_dependencies(game revision.h)
-
# Generate precompiled header
if( USE_COREPCH )
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 0231a0ad1fd..3fea1db2fd1 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -141,8 +141,6 @@ include_directories(
add_library(scripts STATIC ${scripts_STAT_SRCS})
-add_dependencies(scripts genrev)
-
# Generate precompiled header
if( USE_SCRIPTPCH )
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 75b7a2164d7..8b309e05582 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -76,8 +76,6 @@ include_directories(
add_library(shared STATIC ${shared_STAT_SRCS})
-add_dependencies(shared revision.h)
-
target_link_libraries(shared
${ACE_LIBRARY}
)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 4df35a227eb..5c713af5057 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -146,11 +146,9 @@ set(worldserver_LINK_FLAGS "")
add_executable(worldserver ${worldserver_SRCS})
if( NOT WIN32 )
- add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
+ add_definitions(-D_TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf")
endif()
-add_dependencies(worldserver revision.h)
-
if( UNIX )
set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
endif()