summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xCMakeLists.txt4
-rw-r--r--cmake/opentrack-platform.cmake29
2 files changed, 5 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eee0e4c3..ba838a3e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,3 @@ endforeach()
merge_translations()
install_sources()
-
-foreach(k C CXX)
- fix_flags(${k} "DNDEBUG" "")
-endforeach()
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index a3f12f96..9bed520c 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -116,31 +116,12 @@ if(NOT MSVC)
set(CMAKE_CXX_EXTENSIONS FALSE)
endif()
-set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
+foreach(k _RELEASE _DEBUG _RELWITHDEBINFO _MINSIZEREL)
+ set(CMAKE_C_FLAGS${k} "${CMAKE_C_FLAGS${k}} -UNDEBUG")
+ set(CMAKE_CXX_FLAGS${k} "${CMAKE_CXX_FLAGS${k}} -UNDEBUG")
+endforeach()
-function(fix_flags lang flag replacement)
- set(part "-")
- set(pfx "-")
- if(MSVC)
- set(part "[-/]")
- set(pfx "/")
- endif()
- if(".${replacement}" STREQUAL ".")
- set(pfx "")
- endif()
- foreach(k _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO "")
- set(tmp "${CMAKE_${lang}_FLAGS${k}}")
- if(NOT ".${replacement}" STREQUAL ".")
- string(APPEND replacement " ")
- endif()
- string(REGEX REPLACE "(^| )${part}${flag}(\$| )" " ${pfx}${replacement}" CMAKE_${lang}_FLAGS${k} "${CMAKE_${lang}_FLAGS${k}}")
- if(NOT ".${tmp}" STREQUAL ".${CMAKE_${lang}_FLAGS${k}}")
- set(CMAKE_${lang}_FLAGS${k} "${CMAKE_${lang}_FLAGS${k}}" CACHE STRING "")
- else()
- set(CMAKE_${lang}_FLAGS${k} "${CMAKE_${lang}_FLAGS${k}} ${pfx}${replacement}" CACHE STRING "")
- endif()
- endforeach()
-endfunction()
+set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
# nix -rdynamic passed from Linux-GNU.cmake
if(CMAKE_COMPILER_IS_GNUCXX)