aboutsummaryrefslogtreecommitdiff
path: root/cmake
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 /cmake
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 'cmake')
-rw-r--r--cmake/compiler/gcc/settings.cmake16
-rw-r--r--cmake/compiler/msvc/settings.cmake21
-rw-r--r--cmake/compiler/xcode/settings.cmake3
-rw-r--r--cmake/platform/unix/cmake_uninstall.in.cmake23
-rw-r--r--cmake/platform/unix/settings.cmake6
-rw-r--r--cmake/showoptions.cmake2
6 files changed, 54 insertions, 17 deletions
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index a3a3240deb8..e98be5011ff 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -1,3 +1,11 @@
+# build in Release-mode by default if not explicitly set
+if( NOT CMAKE_BUILD_TYPE )
+ set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE=${CMAKE_BUILD_TYPE})
+
add_definitions(-fno-delete-null-pointer-checks)
if( USE_SFMT)
@@ -6,18 +14,18 @@ if( USE_SFMT)
add_definitions(-msse2 -mfpmath=sse)
endif()
add_definitions(-DHAVE_SSE2 -D__SSE2__)
- message(STATUS "- GCC: SFMT enabled, SSE2 flags forced")
+ message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
endif()
if( WITH_WARNINGS )
add_definitions(-Wall -Wfatal-errors -Wextra)
- message(STATUS "- GCC: All warnings enabled")
+ message(STATUS "GCC: All warnings enabled")
else()
add_definitions(--no-warnings)
- message(STATUS "- GCC: All warnings disabled")
+ message(STATUS "GCC: All warnings disabled")
endif()
if( WITH_COREDEBUG )
add_definitions(-ggdb3)
- message(STATUS "- GCC: Debug-flags set (-ggdb3)")
+ message(STATUS "GCC: Debug-flags set (-ggdb3)")
endif()
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
index 89841d87a7b..fd96ea016e1 100644
--- a/cmake/compiler/msvc/settings.cmake
+++ b/cmake/compiler/msvc/settings.cmake
@@ -10,46 +10,49 @@ if(PLATFORM EQUAL 64)
# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper
# debugger functionality.
add_definitions("-D_WIN64")
- message(STATUS "- MSVC: 64-bit platform, enforced -D_WIN64 parameter")
+ message(STATUS "MSVC: 64-bit platform, enforced -D_WIN64 parameter")
#Enable extended object support for debug compiles on X64 (not required on X86)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
- message(STATUS "- MSVC: Enabled extended object-support for debug-compiles")
+ message(STATUS "MSVC: Enabled extended object-support for debug-compiles")
else()
# mark 32 bit executables large address aware so they can use > 2GB address space
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
- message(STATUS "- MSVC: Enabled large address awareness")
+ message(STATUS "MSVC: Enabled large address awareness")
# Test if we need SSE2-support
if(USE_SFMT)
add_definitions(/arch:SSE2)
- message(STATUS "- MSVC: Enabled SSE2 support")
+ message(STATUS "MSVC: Enabled SSE2 support")
endif()
endif()
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE="$(ConfigurationName)")
+
# multithreaded compiling on VS
if((NOT USE_COREPCH) AND (NOT USE_SCRIPTPCH))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
- message(STATUS "- MSVC: PCH not used - enabled multithreaded compiling")
+ message(STATUS "MSVC: PCH not used - enabled multithreaded compiling")
endif()
# Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES - eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns
add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
-message(STATUS "- MSVC: Overloaded standard names")
+message(STATUS "MSVC: Overloaded standard names")
# Ignore warnings about older, less secure functions
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-message(STATUS "- MSVC: Disabled NON-SECURE warnings")
+message(STATUS "MSVC: Disabled NON-SECURE warnings")
#Ignore warnings about POSIX deprecation
add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
-message(STATUS "- MSVC: Disabled POSIX warnings")
+message(STATUS "MSVC: Disabled POSIX warnings")
# disable warnings in Visual Studio 8 and above if not wanted
if(NOT WITH_WARNINGS)
if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
- message(STATUS "- MSVC: Disabled generic compiletime warnings")
+ message(STATUS "MSVC: Disabled generic compiletime warnings")
endif()
endif()
diff --git a/cmake/compiler/xcode/settings.cmake b/cmake/compiler/xcode/settings.cmake
new file mode 100644
index 00000000000..5a01cee61ec
--- /dev/null
+++ b/cmake/compiler/xcode/settings.cmake
@@ -0,0 +1,3 @@
+# Set build-directive (used in core to tell which buildtype we used)
+add_definitions(-D_BUILD_DIRECTIVE="\"$(CONFIGURATION)"\")
+
diff --git a/cmake/platform/unix/cmake_uninstall.in.cmake b/cmake/platform/unix/cmake_uninstall.in.cmake
new file mode 100644
index 00000000000..06f9c8263a8
--- /dev/null
+++ b/cmake/platform/unix/cmake_uninstall.in.cmake
@@ -0,0 +1,23 @@
+# from cmake wiki
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"${file}\"")
+ IF(EXISTS "${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF("${rm_retval}" STREQUAL 0)
+ ELSE("${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+ ENDIF("${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "${file}")
+ MESSAGE(STATUS "File \"${file}\" does not exist.")
+ ENDIF(EXISTS "${file}")
+ENDFOREACH(file)
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
index 9dae9f5ca9f..72d4ea30927 100644
--- a/cmake/platform/unix/settings.cmake
+++ b/cmake/platform/unix/settings.cmake
@@ -12,9 +12,9 @@ endif()
# configure uninstaller
configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY
+ "${CMAKE_SOURCE_DIR}/cmake/platform/unix/cmake_uninstall.in.cmake"
+ "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
+ @ONLY
)
message(STATUS "UNIX: Configuring uninstall target")
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
index e8604eded46..e653f05b8a7 100644
--- a/cmake/showoptions.cmake
+++ b/cmake/showoptions.cmake
@@ -1,7 +1,7 @@
# output generic information about the core and buildtype chosen
message("")
-message("* TrinityCore revision : ${HG_REVISION}")
+message("* TrinityCore revision : ${hg_rev_id_str} (${hg_rev_hash_str})")
if( UNIX )
message("* Build binaries in : ${CMAKE_BUILD_TYPE} mode")
endif()