dune/common/CMakeLists.txt

@@ -4,11 +4,6 @@ add_subdirectory("std")
 add_subdirectory("test")
 
 #build the library dunecommon
-if(LAPACK_FOUND)
-  set(_additional_libs ${LAPACK_LIBRARIES})
-elseif(BLAS_FOUND)
-  set(_additional_libs ${BLAS_LIBRARIES})
-endif(LAPACK_FOUND)
 
 if(HAVE_MPROTECT)
   set(debugallocator_src "debugallocator.cc")
@@ -25,10 +20,11 @@ dune_add_library("dunecommon"
   path.cc
   simd/test.cc
   stdstreams.cc
-  stdthread.cc
-  ADD_LIBS "${_additional_libs}")
+  stdthread.cc)
 
+add_dune_blas_lapack_flags(dunecommon)
 add_dune_tbb_flags(dunecommon)
+
 #install headers
 install(FILES
         alignedallocator.hh

dune/common/classname.hh

@@ -14,7 +14,8 @@
 #include <typeinfo>
 #include <type_traits>
 
-#if HAVE_CXA_DEMANGLE
+#if __has_include(<cxxabi.h>) && !DISABLE_CXA_DEMANGLE
+#define HAVE_CXA_DEMANGLE 1
 #include <cxxabi.h>
 #endif // #if HAVE_CXA_DEMANGLE
 

dune/common/test/CMakeLists.txt

@@ -71,13 +71,12 @@ dune_add_test(NAME check_fvector_size_fail2
 dune_add_test(NAME classnametest-demangled
               SOURCES classnametest.cc
               LINK_LIBRARIES dunecommon
-              CMAKE_GUARD HAVE_CXA_DEMANGLE
               LABELS quick)
 
 dune_add_test(NAME classnametest-fallback
               SOURCES classnametest.cc
               LINK_LIBRARIES dunecommon
-              COMPILE_DEFINITIONS BASICCHECK
+              COMPILE_DEFINITIONS DISABLE_CXA_DEMANGLE
               LABELS quick)
 
 dune_add_test(SOURCES concept.cc

dune/common/test/classnametest.cc

@@ -131,7 +131,7 @@ int main()
   checkname(t, Dune::className(Base{}), {}, R"(\bBase\b)");
   std::cout << std::endl;
 
-  #if BASICCHECK
+  #if !HAVE_CXA_DEMANGLE
   // in this case we only make sure that no segfault or similar happens
   return 0;
   #else