Allow building MCADefrag at the same time as MCServer
This commit is contained in:
Tycho
parent
42e9b21fb2
commit
2acf218700
@ -3,6 +3,15 @@ cmake_minimum_required (VERSION 2.6)
|
|||||||
# Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
|
# 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)
|
enable_language(CXX C)
|
||||||
|
|
||||||
|
#THis has to be done before any flags have been set up.
|
||||||
|
if(${BUILD_TOOLS})
|
||||||
|
add_subdirectory(Tools/MCADefrag/)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${BUILD_UNSTABLE_TOOLS})
|
||||||
|
add_subdirectory(Tools/GeneratorPerformanceTest/)
|
||||||
|
endif()
|
||||||
|
|
||||||
include(SetFlags.cmake)
|
include(SetFlags.cmake)
|
||||||
set_flags()
|
set_flags()
|
||||||
set_lib_flags()
|
set_lib_flags()
|
||||||
@ -46,9 +55,5 @@ add_subdirectory(lib/polarssl/ EXCLUDE_FROM_ALL)
|
|||||||
|
|
||||||
set_exe_flags()
|
set_exe_flags()
|
||||||
|
|
||||||
if(${BUILD_TOOLS})
|
|
||||||
add_subdirectory(Tools/GeneratorPerformanceTest/)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory (src)
|
add_subdirectory (src)
|
||||||
|
|
||||||
|
|||||||
193
SetFlags.cmake
193
SetFlags.cmake
@ -23,9 +23,6 @@ endmacro()
|
|||||||
|
|
||||||
|
|
||||||
macro(set_flags)
|
macro(set_flags)
|
||||||
if(NOT DEFINED ${FLAGS_SET})
|
|
||||||
set(FLAGS_SET 1)
|
|
||||||
|
|
||||||
# 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")
|
||||||
@ -88,121 +85,105 @@ macro(set_flags)
|
|||||||
string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
||||||
string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(set_lib_flags)
|
macro(set_lib_flags)
|
||||||
if(NOT DEFINED ${LIB_FLAGS_SET})
|
# Set lower warnings-level for the libraries:
|
||||||
set(LIB_FLAGS_SET 1)
|
if (MSVC)
|
||||||
# Set lower warnings-level for the libraries:
|
# Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2)
|
||||||
if (MSVC)
|
string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
||||||
# Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2)
|
string(REPLACE "/W3" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
||||||
string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
||||||
string(REPLACE "/W3" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
string(REPLACE "/W3" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
||||||
string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
else()
|
||||||
string(REPLACE "/W3" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -w")
|
||||||
|
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -w")
|
||||||
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -w")
|
||||||
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -w")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# On Unix we use two dynamic loading libraries dl and ltdl.
|
||||||
|
# Preference is for dl on unknown systems as it is specified in POSIX
|
||||||
|
# the dynamic loader is used by lua and sqllite.
|
||||||
|
if (UNIX)
|
||||||
|
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
|
set(DYNAMIC_LOADER ltdl)
|
||||||
else()
|
else()
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -w")
|
set(DYNAMIC_LOADER dl)
|
||||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -w")
|
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -w")
|
|
||||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -w")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# On Unix we use two dynamic loading libraries dl and ltdl.
|
|
||||||
# Preference is for dl on unknown systems as it is specified in POSIX
|
|
||||||
# the dynamic loader is used by lua and sqllite.
|
|
||||||
if (UNIX)
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
|
||||||
set(DYNAMIC_LOADER ltdl)
|
|
||||||
else()
|
|
||||||
set(DYNAMIC_LOADER dl)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(enable_profile)
|
macro(enable_profile)
|
||||||
if(NOT DEFINED ${PROFILE_ENABLED})
|
# Declare the flags used for profiling builds:
|
||||||
set(PROFILE_ENABLED 1)
|
if (MSVC)
|
||||||
|
set (CXX_PROFILING "")
|
||||||
# Declare the flags used for profiling builds:
|
set (LNK_PROFILING "/PROFILE")
|
||||||
if (MSVC)
|
else()
|
||||||
set (CXX_PROFILING "")
|
set (CXX_PROFILING "-pg")
|
||||||
set (LNK_PROFILING "/PROFILE")
|
set (LNK_PROFILING "-pg")
|
||||||
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_RELEASE} ${CXX_PROFILING}"
|
|
||||||
CACHE STRING "Flags used by the C++ compiler during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_C_FLAGS_RELEASEPROFILE
|
|
||||||
"${CMAKE_C_FLAGS_RELEASE} ${CXX_PROFILING}"
|
|
||||||
CACHE STRING "Flags used by the C compiler during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
|
|
||||||
"${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
|
|
||||||
CACHE STRING "Flags used for linking binaries during profile builds."
|
|
||||||
FORCE )
|
|
||||||
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
|
|
||||||
"${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${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)
|
|
||||||
endif()
|
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_RELEASE} ${CXX_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C++ compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_C_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_C_FLAGS_RELEASE} ${CXX_PROFILING}"
|
||||||
|
CACHE STRING "Flags used by the C compiler during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
|
||||||
|
CACHE STRING "Flags used for linking binaries during profile builds."
|
||||||
|
FORCE )
|
||||||
|
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
|
||||||
|
"${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${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)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(set_exe_flags)
|
macro(set_exe_flags)
|
||||||
if(NOT DEFINED ${EXE_FLAGS_SET})
|
# Remove disabling the maximum warning level:
|
||||||
set(EXE_FLAGS_SET 1)
|
# 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;
|
||||||
# Remove disabling the maximum warning level:
|
# the important warnings are turned on using #pragma in Globals.h
|
||||||
# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
|
if (NOT MSVC)
|
||||||
# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;
|
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
||||||
# the important warnings are turned on using #pragma in Globals.h
|
string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
||||||
if (NOT MSVC)
|
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
||||||
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
string(REPLACE "-w" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
||||||
string(REPLACE "-w" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
add_flags_cxx("-Wall")
|
||||||
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
|
||||||
string(REPLACE "-w" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
|
|
||||||
add_flags_cxx("-Wall")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|||||||
@ -30,10 +30,8 @@ endfunction()
|
|||||||
|
|
||||||
|
|
||||||
# Include the libraries:
|
# Include the libraries:
|
||||||
if(NOT DEFINED ${ZLIB})
|
|
||||||
add_subdirectory(../../lib/zlib lib/zlib)
|
add_subdirectory(../../lib/zlib lib/zlib)
|
||||||
set(ZLIB 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set_exe_flags()
|
set_exe_flags()
|
||||||
|
|
||||||
|
|||||||
@ -8,12 +8,14 @@ file(GLOB SOURCE
|
|||||||
"*.c"
|
"*.c"
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(zlib ${SOURCE})
|
if(NOT TARGET zlib)
|
||||||
|
add_library(zlib ${SOURCE})
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
# Remove SCL warnings, we expect this library to have been tested safe
|
# Remove SCL warnings, we expect this library to have been tested safe
|
||||||
SET_TARGET_PROPERTIES(
|
SET_TARGET_PROPERTIES(
|
||||||
zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS"
|
zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS"
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user