Merging develop into master

SCOREC · Feb 4, 2023 · 229f849 · 229f849
2 parents 8311337 + e9772ac
commit 229f849
Show file tree

Hide file tree

Showing 47 changed files with 1,846 additions and 199 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -152,12 +152,12 @@ target_compile_features(core INTERFACE cxx_std_11)
 scorec_export_library(core)
 
 #check for mallinfo2
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
   include(CheckCXXSymbolExists)
   check_cxx_symbol_exists(mallinfo2 "malloc.h" PUMI_HAS_MALLINFO2)
   if(PUMI_HAS_MALLINFO2)
     target_compile_definitions(core INTERFACE -DPUMI_HAS_MALLINFO2)
-    target_compile_definitions(pumi PRIVATE -DPUMI_HAS_MALLINFO2)
+    target_compile_definitions(pcu PRIVATE -DPUMI_HAS_MALLINFO2)
   endif()
 endif()