Merge pull request #533 from mc-server/CmakeMultiConfig
Cmake multi config
This commit is contained in:
commit
83bdbafaa3
23
.gitignore
vendored
23
.gitignore
vendored
@ -64,39 +64,62 @@ MCServer.dir/
|
|||||||
*.opensdf
|
*.opensdf
|
||||||
*.sdf
|
*.sdf
|
||||||
*.sln
|
*.sln
|
||||||
|
*.idb
|
||||||
|
|
||||||
#cmake output folders
|
#cmake output folders
|
||||||
ZERO_CHECK.dir/
|
ZERO_CHECK.dir/
|
||||||
lib/cryptopp/Debug/
|
lib/cryptopp/Debug/
|
||||||
|
lib/cryptopp/DebugProfile/
|
||||||
lib/cryptopp/Release/
|
lib/cryptopp/Release/
|
||||||
|
lib/cryptopp/ReleaseProfile/
|
||||||
lib/cryptopp/cryptopp.dir/
|
lib/cryptopp/cryptopp.dir/
|
||||||
lib/expat/Debug/
|
lib/expat/Debug/
|
||||||
|
lib/expat/DebugProfile/
|
||||||
lib/expat/Release/
|
lib/expat/Release/
|
||||||
|
lib/expat/ReleaseProfile/
|
||||||
lib/expat/expat.dir/
|
lib/expat/expat.dir/
|
||||||
lib/inifile/Debug/
|
lib/inifile/Debug/
|
||||||
|
lib/inifile/DebugProfile/
|
||||||
lib/inifile/Release/
|
lib/inifile/Release/
|
||||||
|
lib/inifile/ReleaseProfile/
|
||||||
lib/inifile/inifile.dir/
|
lib/inifile/inifile.dir/
|
||||||
lib/jsoncpp/Debug/
|
lib/jsoncpp/Debug/
|
||||||
|
lib/jsoncpp/DebugProfile/
|
||||||
lib/jsoncpp/Release/
|
lib/jsoncpp/Release/
|
||||||
|
lib/jsoncpp/ReleaseProfile/
|
||||||
lib/jsoncpp/jsoncpp.dir/
|
lib/jsoncpp/jsoncpp.dir/
|
||||||
lib/lua/Debug/
|
lib/lua/Debug/
|
||||||
|
lib/lua/DebugProfile/
|
||||||
lib/lua/Release/
|
lib/lua/Release/
|
||||||
|
lib/lua/ReleaseProfile/
|
||||||
lib/lua/lua.dir/
|
lib/lua/lua.dir/
|
||||||
lib/luaexpat/Debug/
|
lib/luaexpat/Debug/
|
||||||
|
lib/luaexpat/DebugProfile/
|
||||||
lib/luaexpat/Release/
|
lib/luaexpat/Release/
|
||||||
|
lib/luaexpat/ReleaseProfile/
|
||||||
lib/luaexpat/luaexpat.dir/
|
lib/luaexpat/luaexpat.dir/
|
||||||
lib/md5/Debug/
|
lib/md5/Debug/
|
||||||
|
lib/md5/DebugProfile/
|
||||||
lib/md5/Release/
|
lib/md5/Release/
|
||||||
|
lib/md5/ReleaseProfile/
|
||||||
lib/md5/md5.dir/
|
lib/md5/md5.dir/
|
||||||
lib/sqlite/Debug/
|
lib/sqlite/Debug/
|
||||||
|
lib/sqlite/DebugProfile/
|
||||||
lib/sqlite/Release/
|
lib/sqlite/Release/
|
||||||
|
lib/sqlite/ReleaseProfile/
|
||||||
lib/sqlite/sqlite.dir/
|
lib/sqlite/sqlite.dir/
|
||||||
lib/tolua++/Debug/
|
lib/tolua++/Debug/
|
||||||
|
lib/tolua++/DebugProfile/
|
||||||
lib/tolua++/Release/
|
lib/tolua++/Release/
|
||||||
|
lib/tolua++/ReleaseProfile/
|
||||||
lib/tolua++/tolua.dir/
|
lib/tolua++/tolua.dir/
|
||||||
lib/tolua++/tolualib.dir/
|
lib/tolua++/tolualib.dir/
|
||||||
lib/zlib/Debug/
|
lib/zlib/Debug/
|
||||||
|
lib/zlib/DebugProfile/
|
||||||
lib/zlib/Release/
|
lib/zlib/Release/
|
||||||
|
lib/zlib/ReleaseProfile/
|
||||||
lib/zlib/zlib.dir/
|
lib/zlib/zlib.dir/
|
||||||
src/Debug/
|
src/Debug/
|
||||||
|
src/DebugProfile/
|
||||||
src/Release/
|
src/Release/
|
||||||
|
src/ReleaseProfile/
|
||||||
|
126
CMakeLists.txt
126
CMakeLists.txt
@ -1,40 +1,30 @@
|
|||||||
|
|
||||||
cmake_minimum_required (VERSION 2.6)
|
cmake_minimum_required (VERSION 2.6)
|
||||||
project (MCServer)
|
|
||||||
|
|
||||||
macro(add_flags FLAGS)
|
# Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
|
||||||
|
enable_language(CXX C)
|
||||||
|
|
||||||
|
macro (add_flags_lnk FLAGS)
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAGS}")
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FLAGS}")
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${FLAGS}")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${FLAGS}")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${FLAGS}")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${FLAGS}")
|
||||||
|
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${FLAGS}")
|
||||||
|
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${FLAGS}")
|
||||||
|
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${FLAGS}")
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(add_flags_cxx FLAGS)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAGS}")
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAGS}")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FLAGS}")
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
|
||||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${FLAGS}")
|
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} ${FLAGS}")
|
|
||||||
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${FLAGS}")
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
SET(CMAKE_CXX_FLAGS_PROFILE
|
|
||||||
"${CMAKE_CXX_FLAGS_DEBUG} -pg -DNDEBUG"
|
|
||||||
CACHE STRING "Flags used by the C++ compiler during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_C_FLAGS_PROFILE
|
|
||||||
"${CMAKE_C_FLAGS_DEBUG} -pg -DNDEBUG"
|
|
||||||
CACHE STRING "Flags used by the C compiler during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_EXE_LINKER_FLAGS_PROFILE
|
|
||||||
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pg"
|
|
||||||
CACHE STRING "Flags used for linking binaries during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE
|
|
||||||
"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -pg"
|
|
||||||
CACHE STRING "Flags used by the shared libraries linker during profile builds."
|
|
||||||
FORCE )
|
|
||||||
MARK_AS_ADVANCED(
|
|
||||||
CMAKE_CXX_FLAGS_PROFILE
|
|
||||||
CMAKE_C_FLAGS_PROFILE
|
|
||||||
CMAKE_EXE_LINKER_FLAGS_PROFILE
|
|
||||||
CMAKE_SHARED_LINKER_FLAGS_PROFILE )
|
|
||||||
|
|
||||||
# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
|
# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
|
||||||
@ -45,32 +35,21 @@ endif()
|
|||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
# Make build use multiple threads under MSVC:
|
# Make build use multiple threads under MSVC:
|
||||||
add_flags("/MP")
|
add_flags_cxx("/MP")
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
#on os x clang adds pthread for us but we need to add it for gcc
|
#on os x clang adds pthread for us but we need to add it for gcc
|
||||||
if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
add_flags("-pthread")
|
add_flags_cxx("-pthread")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
# Let gcc / clang know that we're compiling a multi-threaded app:
|
# Let gcc / clang know that we're compiling a multi-threaded app:
|
||||||
add_flags("-pthread")
|
add_flags_cxx("-pthread")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Allow for a forced 32-bit build under 32-bit OS:
|
# Allow for a forced 32-bit build under 32-bit OS:
|
||||||
if (FORCE_32)
|
if (FORCE_32)
|
||||||
add_flags(-m32)
|
add_flags_cxx("-m32")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
|
add_flags_lnk("-m32")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -m32")
|
|
||||||
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -m32")
|
|
||||||
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -m32")
|
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
|
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -m32")
|
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -m32")
|
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_PROFILE} -m32")
|
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32")
|
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} -m32")
|
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -m32")
|
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_PROFILE} -m32")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set lower warnings-level for the libraries:
|
# Set lower warnings-level for the libraries:
|
||||||
@ -111,6 +90,67 @@ endif()
|
|||||||
# The Expat library is linked in statically, make the source files aware of that:
|
# The Expat library is linked in statically, make the source files aware of that:
|
||||||
add_definitions(-DXML_STATIC)
|
add_definitions(-DXML_STATIC)
|
||||||
|
|
||||||
|
|
||||||
|
# Declare the flags used for profiling builds:
|
||||||
|
if (MSVC)
|
||||||
|
set (CXX_PROFILING "")
|
||||||
|
set (LNK_PROFILING "/PROFILE")
|
||||||
|
else()
|
||||||
|
set (CXX_PROFILING "-pg")
|
||||||
|
set (LNK_PROFILING "-pg")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Declare the profiling configurations:
|
||||||
|
SET(CMAKE_CXX_FLAGS_DEBUGPROFILE
|
||||||
|
"${CMAKE_CXX_FLAGS_DEBUG} ${PCXX_ROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C++ compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_C_FLAGS_DEBUGPROFILE
|
||||||
|
"${CMAKE_C_FLAGS_DEBUG} ${CXX_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
|
||||||
|
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
|
||||||
|
CACHE STRING "Flags used for linking binaries during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE
|
||||||
|
"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the shared libraries linker during profile builds."
|
||||||
|
FORCE )
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
CMAKE_CXX_FLAGS_DEBUGPROFILE
|
||||||
|
CMAKE_C_FLAGS_DEBUGPROFILE
|
||||||
|
CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE
|
||||||
|
CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE )
|
||||||
|
|
||||||
|
SET(CMAKE_CXX_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_CXX_FLAGS_DEBUG} ${CXX_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C++ compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_C_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_C_FLAGS_DEBUG} ${CXX_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
|
||||||
|
CACHE STRING "Flags used for linking binaries during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the shared libraries linker during profile builds."
|
||||||
|
FORCE )
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
CMAKE_CXX_FLAGS_RELEASEPROFILE
|
||||||
|
CMAKE_C_FLAGS_RELEASEPROFILE
|
||||||
|
CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
|
||||||
|
CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE )
|
||||||
|
|
||||||
|
|
||||||
|
# The configuration types need to be set after their respective c/cxx/linker flags and before the project directive
|
||||||
|
set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile" CACHE STRING "" FORCE)
|
||||||
|
project (MCServer)
|
||||||
|
|
||||||
|
|
||||||
# Include all the libraries:
|
# Include all the libraries:
|
||||||
add_subdirectory(lib/inifile/)
|
add_subdirectory(lib/inifile/)
|
||||||
add_subdirectory(lib/jsoncpp/)
|
add_subdirectory(lib/jsoncpp/)
|
||||||
@ -126,7 +166,7 @@ add_subdirectory(lib/md5/)
|
|||||||
# Remove disabling the maximum warning level:
|
# Remove disabling the maximum warning level:
|
||||||
# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
|
# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
|
||||||
# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
|
# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
|
||||||
# the important warnings will be turned on using #pragma in Globals.h
|
# the important warnings are turned on using #pragma in Globals.h
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
||||||
string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
||||||
|
Loading…
Reference in New Issue
Block a user