Merge pull request #970 from berquist/968-cmake

Fix tests broken under CMake compilation
sstsimulator · Jul 17, 2023 · 0a1cd0a · 0a1cd0a
2 parents 74a67f7 + bd86e3c
commit 0a1cd0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/experimental/cmake/sst.cmake b/experimental/cmake/sst.cmake
@@ -42,6 +42,8 @@ if(ZLIB_FOUND)
   set(HAVE_LIBZ ON)
 endif(ZLIB_FOUND)
 
+check_include_file(execinfo.h HAVE_EXECINFO_H)
+check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
 check_include_file(mach/mach_time.h HAVE_MACH_MACH_TIME_H)
 check_include_file(mach-o/dyld.h HAVE_MACH_O_DYLD_H)
 check_symbol_exists(opendir "dirent.h" HAVE_OPENDIR)

diff --git a/experimental/cmake_configure_files/sst_config.h.in b/experimental/cmake_configure_files/sst_config.h.in
@@ -26,6 +26,9 @@
 /* Define to 1 if you have the `argz_stringify' function. */
 #cmakedefine HAVE_ARGZ_STRINGIFY 1
 
+/* Defines if the backtrace function is avalible */
+#cmakedefine HAVE_BACKTRACE 1
+
 /* Define to 1 if you have the `closedir' function. */
 #cmakedefine HAVE_CLOSEDIR 1
 
@@ -60,6 +63,9 @@
 /* Define to 1 if the system has the type `error_t'. */
 #cmakedefine HAVE_ERROR_T 1
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#cmakedefine HAVE_EXECINFO_H 1
+
 /* Defines whether we have the hdf5 library */
 #cmakedefine HAVE_HDF5
 

diff --git a/src/sst/core/testElements/CMakeLists.txt b/src/sst/core/testElements/CMakeLists.txt
@@ -16,19 +16,20 @@
 
 add_library(
   coreTestElement MODULE
-  coreTest_Component.cc
   coreTest_ClockerComponent.cc
+  coreTest_Component.cc
   coreTest_DistribComponent.cc
-  coreTest_RNGComponent.cc
-  coreTest_Serialization.cc
-  coreTest_StatisticsComponent.cc
   coreTest_Links.cc
+  coreTest_MemPoolTest.cc
   coreTest_MessageGeneratorComponent.cc
-  coreTest_SharedObjectComponent.cc
-  coreTest_SubComponent.cc
   coreTest_Module.cc
   coreTest_ParamComponent.cc
-  coreTest_PerfComponent.cc)
+  coreTest_PerfComponent.cc
+  coreTest_RNGComponent.cc
+  coreTest_Serialization.cc
+  coreTest_SharedObjectComponent.cc
+  coreTest_StatisticsComponent.cc
+  coreTest_SubComponent.cc)
 
 add_subdirectory(message_mesh)