From 9cf2e39491a6507ba61ce6ce976f27d04362cf6f Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 26 Oct 2023 16:33:37 -0400 Subject: [PATCH 1/2] support rhel8 .. and silence cmake warning --- cmake/FindSimModSuite.cmake | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmake/FindSimModSuite.cmake b/cmake/FindSimModSuite.cmake index ccbb3d7a6..77d05c930 100644 --- a/cmake/FindSimModSuite.cmake +++ b/cmake/FindSimModSuite.cmake @@ -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) From 6044434dc25c653f5a180a0a3e972c0f3c536fe9 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 26 Oct 2023 16:44:43 -0400 Subject: [PATCH 2/2] increase simmetrix version range --- cmake/FindSimModSuite.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindSimModSuite.cmake b/cmake/FindSimModSuite.cmake index 77d05c930..9997fb456 100644 --- a/cmake/FindSimModSuite.cmake +++ b/cmake/FindSimModSuite.cmake @@ -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")