Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests broken under CMake compilation #970

Merged
merged 2 commits into from
Jul 17, 2023
Merged

Fix tests broken under CMake compilation #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d7d98
Add missing sources to CMake testElements compilation
berquist Jul 12, 2023
bd86e3c
Check in CMake for execinfo.h and backtrace
berquist Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions experimental/cmake/sst.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions experimental/cmake_configure_files/sst_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
15 changes: 8 additions & 7 deletions src/sst/core/testElements/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down