From 11a3132e017136298ebc34e1525ae14add35fe35 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 28 Dec 2013 22:11:52 +0100 Subject: [PATCH 1/5] Added custom configurations for MSVC projects. The DebugProfile and ReleaseProfile configurations add profiling capabilities to the respective build. --- CMakeLists.txt | 68 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2afceaab..c053ae92d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,51 @@ cmake_minimum_required (VERSION 2.6) + +SET(CMAKE_CXX_FLAGS_DEBUGPROFILE + "${CMAKE_CXX_FLAGS_DEBUG} -pg -D_DEBUG" + CACHE STRING "Flags used by the C++ compiler during profile builds." + FORCE ) +SET(CMAKE_C_FLAGS_DEBUGPROFILE + "${CMAKE_C_FLAGS_DEBUG} -pg -D_DEBUG" + CACHE STRING "Flags used by the C compiler during profile builds." + FORCE ) +SET(CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE + "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pg" + CACHE STRING "Flags used for linking binaries during profile builds." + FORCE ) +SET(CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE + "${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_DEBUGPROFILE + CMAKE_C_FLAGS_DEBUGPROFILE + CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE + CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE ) + +SET(CMAKE_CXX_FLAGS_RELEASEPROFILE + "${CMAKE_CXX_FLAGS_DEBUG} -pg -DNDEBUG" + CACHE STRING "Flags used by the C++ compiler during profile builds." + FORCE ) +SET(CMAKE_C_FLAGS_RELEASEPROFILE + "${CMAKE_C_FLAGS_DEBUG} -pg -DNDEBUG" + CACHE STRING "Flags used by the C compiler during profile builds." + FORCE ) +SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE + "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pg" + CACHE STRING "Flags used for linking binaries during profile builds." + FORCE ) +SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE + "${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_RELEASEPROFILE + CMAKE_C_FLAGS_RELEASEPROFILE + CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE + CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE ) + +set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile" CACHE STRING "" FORCE) project (MCServer) macro(add_flags FLAGS) @@ -13,28 +59,6 @@ macro(add_flags FLAGS) set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${FLAGS}") 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): if (NOT MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") From 24371cd7d17f3b3975d7c365f579b7d36cd99ef2 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 28 Dec 2013 22:46:23 +0100 Subject: [PATCH 2/5] CMake: profiling builds get correct commandlines in MSVC. --- CMakeLists.txt | 142 +++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 63 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c053ae92d..2f8fc23f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,62 +1,28 @@ cmake_minimum_required (VERSION 2.6) -SET(CMAKE_CXX_FLAGS_DEBUGPROFILE - "${CMAKE_CXX_FLAGS_DEBUG} -pg -D_DEBUG" - CACHE STRING "Flags used by the C++ compiler during profile builds." - FORCE ) -SET(CMAKE_C_FLAGS_DEBUGPROFILE - "${CMAKE_C_FLAGS_DEBUG} -pg -D_DEBUG" - CACHE STRING "Flags used by the C compiler during profile builds." - FORCE ) -SET(CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE - "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pg" - CACHE STRING "Flags used for linking binaries during profile builds." - FORCE ) -SET(CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE - "${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_DEBUGPROFILE - CMAKE_C_FLAGS_DEBUGPROFILE - CMAKE_EXE_LINKER_FLAGS_DEBUGPROFILE - CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE ) +# 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) -SET(CMAKE_CXX_FLAGS_RELEASEPROFILE - "${CMAKE_CXX_FLAGS_DEBUG} -pg -DNDEBUG" - CACHE STRING "Flags used by the C++ compiler during profile builds." - FORCE ) -SET(CMAKE_C_FLAGS_RELEASEPROFILE - "${CMAKE_C_FLAGS_DEBUG} -pg -DNDEBUG" - CACHE STRING "Flags used by the C compiler during profile builds." - FORCE ) -SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE - "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pg" - CACHE STRING "Flags used for linking binaries during profile builds." - FORCE ) -SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE - "${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_RELEASEPROFILE - CMAKE_C_FLAGS_RELEASEPROFILE - CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE - CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE ) +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() -set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile" CACHE STRING "" FORCE) -project (MCServer) - -macro(add_flags FLAGS) +macro(add_flags_cxx FLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_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_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() # Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC): @@ -69,27 +35,16 @@ endif() if(MSVC) # Make build use multiple threads under MSVC: - add_flags("/MP") + add_flags_cxx("/MP") else() # Let gcc / clang know that we're compiling a multi-threaded app: - add_flags("-pthread") + add_flags_cxx("-pthread") endif() # Allow for a forced 32-bit build under 32-bit OS: if (FORCE_32) - add_flags(-m32) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -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") + add_flags_cxx("-m32") + add_flags_lnk("-m32") endif() # Set lower warnings-level for the libraries: @@ -119,6 +74,67 @@ endif() # The Expat library is linked in statically, make the source files aware of that: 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: add_subdirectory(lib/inifile/) add_subdirectory(lib/jsoncpp/) From 765add36681b997aabe7c7d3fc3177ea56e97e6e Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 28 Dec 2013 22:49:02 +0100 Subject: [PATCH 3/5] Ignore profile build folders created by MSVC build. --- .gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index 977122047..d65144c34 100644 --- a/.gitignore +++ b/.gitignore @@ -67,35 +67,57 @@ MCServer.dir/ #cmake output folders ZERO_CHECK.dir/ lib/cryptopp/Debug/ +lib/cryptopp/DebugProfile/ lib/cryptopp/Release/ +lib/cryptopp/ReleaseProfile/ lib/cryptopp/cryptopp.dir/ lib/expat/Debug/ +lib/expat/DebugProfile/ lib/expat/Release/ +lib/expat/ReleaseProfile/ lib/expat/expat.dir/ lib/inifile/Debug/ +lib/inifile/DebugProfile/ lib/inifile/Release/ +lib/inifile/ReleaseProfile/ lib/inifile/inifile.dir/ lib/jsoncpp/Debug/ +lib/jsoncpp/DebugProfile/ lib/jsoncpp/Release/ +lib/jsoncpp/ReleaseProfile/ lib/jsoncpp/jsoncpp.dir/ lib/lua/Debug/ +lib/lua/DebugProfile/ lib/lua/Release/ +lib/lua/ReleaseProfile/ lib/lua/lua.dir/ lib/luaexpat/Debug/ +lib/luaexpat/DebugProfile/ lib/luaexpat/Release/ +lib/luaexpat/ReleaseProfile/ lib/luaexpat/luaexpat.dir/ lib/md5/Debug/ +lib/md5/DebugProfile/ lib/md5/Release/ +lib/md5/ReleaseProfile/ lib/md5/md5.dir/ lib/sqlite/Debug/ +lib/sqlite/DebugProfile/ lib/sqlite/Release/ +lib/sqlite/ReleaseProfile/ lib/sqlite/sqlite.dir/ lib/tolua++/Debug/ +lib/tolua++/DebugProfile/ lib/tolua++/Release/ +lib/tolua++/ReleaseProfile/ lib/tolua++/tolua.dir/ lib/tolua++/tolualib.dir/ lib/zlib/Debug/ +lib/zlib/DebugProfile/ lib/zlib/Release/ +lib/zlib/ReleaseProfile/ lib/zlib/zlib.dir/ src/Debug/ +src/DebugProfile/ src/Release/ +src/ReleaseProfile/ From 65417dd8369420e1590efec5ae494d8124731005 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sun, 29 Dec 2013 12:45:03 +0100 Subject: [PATCH 4/5] Fixed Linux configuration. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f8fc23f8..d903a56d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,7 +152,7 @@ add_subdirectory(lib/md5/) # the important warnings will be turned on using #pragma in Globals.h if (NOT MSVC) #TODO: set -Wall -Werror -Wextra - add_flags("-Wall -Wextra") + add_flags_cxx("-Wall -Wextra") endif() if (NOT WIN32) From 50956d55ae0ae10a887ec21b5fcc2838bfd44932 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sun, 12 Jan 2014 10:10:20 +0100 Subject: [PATCH 5/5] Ignore Win32 .idb files. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 46955f17c..c1a868db6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ MCServer.dir/ *.opensdf *.sdf *.sln +*.idb #cmake output folders ZERO_CHECK.dir/