diff options
author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-20 15:27:26 +0100 |
---|---|---|
committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-20 15:27:26 +0100 |
commit | 826e280db9018fa557e4c143ed8eedf1bc3ecccc (patch) | |
tree | 43c5174216ddec835d8538960aab373bab3bcd20 | |
parent | possable fix of typo (diff) | |
download | cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar.gz cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar.bz2 cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar.lz cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar.xz cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.tar.zst cuberite-826e280db9018fa557e4c143ed8eedf1bc3ecccc.zip |
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 64 |
1 files changed, 51 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4201602f2..7dff04f8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,21 +2,55 @@ cmake_minimum_required (VERSION 2.6) project (MCServer) +macro(add_flags 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() + +SET(CMAKE_CXX_FLAGS_PROFILE + "${CMAKE_CXX_FLAGS_DEBUG} -pg" + CACHE STRING "Flags used by the C++ compiler during profile builds." + FORCE ) +SET(CMAKE_C_FLAGS_PROFILE + "${CMAKE_C_FLAGS_DEBUG} -pg" + 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 ) + if(WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") + add_flags("/MP") endif() -set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS}) -set(CMAKE_C_FLAGS_BAK ${CMAKE_C_FLAGS}) +set(CMAKE_CXX_FLAGS_RELEASE_BAK "${CMAKE_CXX_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_RELEASE_BAK "${CMAKE_C_FLAGS_RELEASE}") if (UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -w") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -w") else() #remove /W3 from command line -- cannot just cancel it later with /w like in unix because of D9025 - string(REPLACE "/W3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + #only remove frome relase as we force release + string(REPLACE "/W3" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "/W3" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") endif() + set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE}) set(CMAKE_BUILD_TYPE "Release") @@ -31,16 +65,20 @@ add_subdirectory(lib/expat/) add_subdirectory(lib/luaexpat/) add_subdirectory(lib/md5/) +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_BAK}") +set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_BAK}") + #TODo: set -Wall -Werror -Wextra if(UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK} -Wall -Wextra") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BAK} -Wall -Wextra") + add_flags("-Wall -Wextra") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK} /Wall") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BAK} /Wall") + add_flags("/Wall") endif() set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}") -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") +set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic") +set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -rdynamic") +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -rdynamic") add_subdirectory (src) |