1 files changed, 80 insertions, 64 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 )
-
-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)
+# 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 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/)