Cmake build: Prohibit use of external boost if using libstdc++ in debug mode

We are using the compiler falgs _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC
See https://opensource.apple.com/source/gcc/gcc-1640/libstdc++-v3/docs/html/debug.html

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 618f62ac3246d21fcb3d5c9a8a3d799b7477789a..552654b91848911b7ea94a8f53bd709558f2e5f7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,11 @@ if (LYX_ENABLE_VALGRIND_TESTS)
                message(FATAL_ERROR "Cannot use valgrind tests, executable valgrind is missing. Please disable LYX_ENABLE_VALGRIND_TESTS")
        endif()
 endif()
+if (LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC OR LYX_STDLIB_DEBUG)
+  if (LYX_EXTERNAL_BOOST)
+    message(FATAL_ERROR "Using external boost not compatible with debug mode for stdlib")
+  endif()
+endif()
 
 if(LYX_DMG)
        set(LYX_BUNDLE ON)
@@ -676,7 +681,14 @@ else()
          message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
        endif()
        if(LYX_STDLIB_DEBUG)
-               set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+         set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+        else()
+          if(LYX_DEBUG_GLIBC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG")
+          endif()
+          if(LYX_DEBUG_GLIBC_PEDANTIC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG_PEDANTIC")
+          endif()
        endif()
        set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE STRING "Set CXX flags" FORCE)
        set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE STRING "Set debug flags" FORCE)
@@ -1065,14 +1077,6 @@ if(MSVC)
 endif()
 
 
-if(LYX_DEBUG_GLIBC)
-       set(_GLIBCXX_DEBUG ON)
-endif()
-
-if(LYX_DEBUG_GLIBC_PEDANTIC)
-       set(_GLIBCXX_DEBUG_PEDANTIC ON)
-endif()
-
 # Xcode compiler
 if (CMAKE_GENERATOR MATCHES Xcode)
        if (XCODE_VERSION VERSION_LESS "5.0")

diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index ee8a977be2a1dd6651e2a6f5a265faf3cb9f40ce..9fce467818c48898e25349ee69f5e879fe91163c 100644 (file)
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -121,7 +121,4 @@
 #define HAVE_MODE_T
 #endif
 
-#cmakedefine _GLIBCXX_DEBUG 1
-#cmakedefine _GLIBCXX_DEBUG_PEDANTIC 1
-
 #endif