Merge pull request #151 from thelfer/150-support-for-the-enable-glibcxx-debug-option-with-clang-and-intel-compilers

Fix Issue #150

Author: thelfer

cmake/modules/clang.cmake

@@ -36,9 +36,28 @@ if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "Release"))
   set(OPTIMISATION_FLAGS "-O2 -DNDEBUG ${OPTIMISATION_FLAGS}")
 endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "Release"))
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  add_definitions("-g")
-endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+option(enable-glibcxx-debug "use the debug version of the C++ standard as implemented by the glib C++ library" OFF)
+if(enable-glibcxx-debug)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+     set(CMAKE_CXX_FLAGS_DEBUG "-g -D_GLIBCXX_DEBUG -Rno-debug-disables-optimization" CACHE STRING
+      "Flags used by the C++ compiler during debug builds."
+      FORCE)
+  else(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+     set(CMAKE_CXX_FLAGS_DEBUG "-g -D_GLIBCXX_DEBUG" CACHE STRING
+      "Flags used by the C++ compiler during debug builds."
+      FORCE)
+  endif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+else(enable-glibcxx-debug)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -Rno-debug-disables-optimization" CACHE STRING
+        "Flags used by the C++ compiler during debug builds."
+        FORCE)
+  else(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g" CACHE STRING
+        "Flags used by the C++ compiler during debug builds."
+        FORCE)
+  endif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+endif(enable-glibcxx-debug)
 
 if(HAVE_FORTRAN)
   # we associate clang with the gnu fortran compiler

docs/web/CMakeLists.txt

@@ -70,6 +70,7 @@ if(MGIS_HAVE_PANDOC)
   mgis_pandoc_generate_html_page(release-notes-1.2 "--toc" "--toc-depth=3")
   mgis_pandoc_generate_html_page(release-notes-1.2.1 "--number-sections" "--toc" "--toc-depth=3")
   mgis_pandoc_generate_html_page(release-notes-1.2.2 "--number-sections" "--toc" "--toc-depth=3")
+  mgis_pandoc_generate_html_page(release-notes-1.2.3 "--number-sections" "--toc" "--toc-depth=3")
   mgis_pandoc_generate_html_page(release-notes-2.0 "--toc" "--toc-depth=3")
   mgis_pandoc_generate_html_page(release-notes-2.1 "--toc" "--toc-depth=3")
   mgis_pandoc_generate_html_page(release-notes-2.2 "--toc" "--toc-depth=3")

docs/web/mgis-template.html

@@ -89,6 +89,7 @@
 		    <li><a href="release-notes-1.2.html">Version 1.2</a></li>
 		    <li><a href="release-notes-1.2.1.html">Version 1.2.1</a></li>
 		    <li><a href="release-notes-1.2.2.html">Version 1.2.2</a></li>
+		    <li><a href="release-notes-1.2.3.html">Version 1.2.3</a></li>
 		  </ul>
 		</li>
 		<li><a>Version 2.0.x</a>

docs/web/release-notes-1.2.3.md

@@ -0,0 +1,24 @@
+---
+title: MFrontGenericInterfaceSupport Version 1.2.3
+author: Thomas Helfer, Jérémy Bleyer
+date: 2020
+lang: en-EN
+documentclass: article
+from: markdown+tex_math_single_backslash
+geometry:
+  - margin=2cm
+papersize: a4
+link-citations: true
+colorlinks: true
+figPrefixTemplate: "$$i$$"
+tabPrefixTemplate: "$$i$$"
+secPrefixTemplate: "$$i$$"
+eqnPrefixTemplate: "($$i$$)"
+bibliography: bibliography.bib
+---
+
+# Issues solved
+
+## Issue #150: Support for the `enable-glibcxx-debug` option with `clang` and `intel` compilers
+
+For more details, see <https://github.com/thelfer/MFrontGenericInterfaceSupport/issues/150>