flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

CMake: Release profile build inherits from Release, not Debug.

Browse Source
This commit is contained in:
madmaxoft 2014-01-14 11:05:57 +01:00
parent e3117d797e
commit f31043a5e7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -46,17 +46,20 @@ else()
add_flags_cxx("-pthread") add_flags_cxx("-pthread")
endif() endif()
# Allow for a forced 32-bit build under 64-bit OS: # Allow for a forced 32-bit build under 64-bit OS:
if (FORCE_32) if (FORCE_32)
add_flags_cxx("-m32") add_flags_cxx("-m32")
add_flags_lnk("-m32") add_flags_lnk("-m32")
endif() endif()
#have the compiler generate code spercificly targeted at the current machine on Linux
# Have the compiler generate code specifically targeted at the current machine on Linux
if(LINUX AND NOT CROSSCOMPILE) if(LINUX AND NOT CROSSCOMPILE)
add_flags_cxx("-march=native") add_flags_cxx("-march=native")
endif() endif()
# Set lower warnings-level for the libraries: # Set lower warnings-level for the libraries:
if (MSVC) if (MSVC)
# Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2) # Remove /W3 from command line -- cannot just cancel it later with /w like in unix, MSVC produces a D9025 warning (option1 overriden by option2)
@ -71,16 +74,19 @@ else()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -w") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -w")
endif() endif()
# Under clang, we need to disable ASM support in CryptoPP: # Under clang, we need to disable ASM support in CryptoPP:
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_definitions(-DCRYPTOPP_DISABLE_ASM) add_definitions(-DCRYPTOPP_DISABLE_ASM)
endif() endif()
# Under Windows, we need Lua as DLL; on *nix we need it linked statically: # Under Windows, we need Lua as DLL; on *nix we need it linked statically:
if (WIN32) if (WIN32)
add_definitions(-DLUA_BUILD_AS_DLL) add_definitions(-DLUA_BUILD_AS_DLL)
endif() endif()
# On Unix we use two dynamic loading libraries dl and ltdl. # On Unix we use two dynamic loading libraries dl and ltdl.
# Preference is for dl on unknown systems as it is specified in POSIX # Preference is for dl on unknown systems as it is specified in POSIX
# the dynamic loader is used by lua and sqllite. # the dynamic loader is used by lua and sqllite.
@ -92,6 +98,7 @@ if (UNIX)
endif() endif()
endif() 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)
@ -105,6 +112,7 @@ else()
set (LNK_PROFILING "-pg") set (LNK_PROFILING "-pg")
endif() endif()
# Declare the profiling configurations: # Declare the profiling configurations:
SET(CMAKE_CXX_FLAGS_DEBUGPROFILE SET(CMAKE_CXX_FLAGS_DEBUGPROFILE
"${CMAKE_CXX_FLAGS_DEBUG} ${PCXX_ROFILING}" "${CMAKE_CXX_FLAGS_DEBUG} ${PCXX_ROFILING}"
@ -129,19 +137,19 @@ MARK_AS_ADVANCED(
CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE ) CMAKE_SHARED_LINKER_FLAGS_DEBUGPROFILE )
SET(CMAKE_CXX_FLAGS_RELEASEPROFILE SET(CMAKE_CXX_FLAGS_RELEASEPROFILE
"${CMAKE_CXX_FLAGS_DEBUG} ${CXX_PROFILING}" "${CMAKE_CXX_FLAGS_RELEASE} ${CXX_PROFILING}"
CACHE STRING "Flags used by the C++ compiler during profile builds." CACHE STRING "Flags used by the C++ compiler during profile builds."
FORCE ) FORCE )
SET(CMAKE_C_FLAGS_RELEASEPROFILE SET(CMAKE_C_FLAGS_RELEASEPROFILE
"${CMAKE_C_FLAGS_DEBUG} ${CXX_PROFILING}" "${CMAKE_C_FLAGS_RELEASE} ${CXX_PROFILING}"
CACHE STRING "Flags used by the C compiler during profile builds." CACHE STRING "Flags used by the C compiler during profile builds."
FORCE ) FORCE )
SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE SET(CMAKE_EXE_LINKER_FLAGS_RELEASEPROFILE
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}" "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
CACHE STRING "Flags used for linking binaries during profile builds." CACHE STRING "Flags used for linking binaries during profile builds."
FORCE ) FORCE )
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE SET(CMAKE_SHARED_LINKER_FLAGS_RELEASEPROFILE
"${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${LNK_PROFILING}" "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${LNK_PROFILING}"
CACHE STRING "Flags used by the shared libraries linker during profile builds." CACHE STRING "Flags used by the shared libraries linker during profile builds."
FORCE ) FORCE )
MARK_AS_ADVANCED( MARK_AS_ADVANCED(