Merge pull request #2173 from mc-server/CleanCmake

Moved shared cmake flags to the CMAKE_C_FLAGS var
cuberite · May 30, 2015 · ddb173b2898e1ab9fccaf1a2f0c51080e3de9712 · ddb173b
2 parents 9b798ff + d5c89ec
commit ddb173b2898e1ab9fccaf1a2f0c51080e3de9712
Unified Split

Showing with 2 additions and 8 deletions.

+2 −8 SetFlags.cmake
diff --git a/SetFlags.cmake b/SetFlags.cmake
@@ -16,14 +16,8 @@ macro (add_flags_lnk FLAGS)
 endmacro()

 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_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_COVERAGE   "${CMAKE_C_FLAGS_COVERAGE}   ${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          "${CMAKE_CXX_FLAGS} ${FLAGS}")
+	set(CMAKE_C_FLAGS            "${CMAKE_C_FLAGS}   ${FLAGS}")
 endmacro()