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.

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

Support Builds with Simmetrix SimModSuite on RHEL8/9 Systems #414

Merged
merged 2 commits into from
Feb 6, 2024
Merged
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions cmake/FindSimModSuite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ string(REGEX REPLACE
"${SIM_VERSION}")

set(MIN_VALID_SIM_VERSION 15.0.191017)
set(MAX_VALID_SIM_VERSION 18.0.220930)
set(MAX_VALID_SIM_VERSION 2023.1.230907)
if( ${SKIP_SIMMETRIX_VERSION_CHECK} )
message(STATUS "Skipping Simmetrix SimModSuite version check."
" This may result in undefined behavior")
Expand Down Expand Up @@ -171,10 +171,23 @@ if (UNIX AND NOT APPLE)
set(SIMMODSUITE_LIBS ${SIMMODSUITE_LIBS} ${CMAKE_THREAD_LIBS_INIT})
endif()

if (SIM_ARCHOS STREQUAL x64_rhel8_gcc83)
find_library(XDR_LIB tirpc)
if(XDR_LIB)
message(STATUS "Found XDR_LIB ${XDR_LIB}")
set(SIMMODSUITE_LIBS ${SIMMODSUITE_LIBS} ${XDR_LIB})
else()
message(FATAL_ERROR "The libtirpc library was not found. It defines xdr symbols "
"(e.g., xdrmem_create) that are need by SimModSuite on systems using "
"glibc newer than 2.32. Note, glibc starting with 2.26 could optionally "
"have been built without the xdr symbols.")
endif()
endif()

include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set SIMMODSUITE_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(SIMMODSUITE DEFAULT_MSG
find_package_handle_standard_args(SimModSuite DEFAULT_MSG
SIMMODSUITE_LIBS SIMMODSUITE_INCLUDE_DIR
SIMMODSUITE_MAJOR_VERSION SIMMODSUITE_MINOR_VERSION)

Expand Down
Loading