Merge pull request #318 from OpenBioSim/features_and_fixes

Features and fixes for 2025.1.0

Author: lohedges

corelib/CMakeLists.txt

@@ -4,9 +4,9 @@
 #
 ################################
 
-# require cmake >= 3.3.0 (released in 2018)
-cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR)
-cmake_policy(VERSION 3.3)
+# require cmake >= 3.30.0
+cmake_minimum_required(VERSION 3.30.0 FATAL_ERROR)
+cmake_policy(VERSION 3.30)
 
 # Read the version number (so we can set it once in one place)
 file (STRINGS "../version.txt" VERSION_TEXT)
@@ -18,6 +18,8 @@ set (S_VERSION_MINOR ${CMAKE_MATCH_2})
 set (S_VERSION_PATCH ${CMAKE_MATCH_3})
 set (SIRE_VERSION "${S_VERSION_MAJOR}.${S_VERSION_MINOR}.${S_VERSION_PATCH}")
 
+set (SIRE_CXX_STANDARD 14)
+
 message( STATUS "Building Sire ${SIRE_VERSION}")
 
 ############
@@ -392,6 +394,7 @@ set(NEED_UNDEF_STRICT_ANSI FALSE)
 if (SIRE_HAS_CPP_17)
   message(STATUS "Compiler supports C++ 2017")
   set(SIRE_CXX_NG_FLAGS "${SIRE_CXX_NG_FLAGS} ${SLASH_HYPHEN}std${COLON_EQUALS}c++17 ${SLASH_HYPHEN}DSIRE_HAS_CPP_17 ${SLASH_HYPHEN}DSIRE_HAS_CPP_14 ${SLASH_HYPHEN}DSIRE_HAS_CPP_1Y ${SLASH_HYPHEN}DSIRE_HAS_CPP_11")
+  set(SIRE_CXX_STANDARD 17)
 
   if (APPLE)
     # C++ 2017 does not support aligned_alloc on old MacOS - check for this!
@@ -431,6 +434,7 @@ if (SIRE_HAS_CPP_17)
 elseif (SIRE_HAS_CPP_14)
   message(STATUS "Compiler supports C++ 2014")
   set(SIRE_CXX_NG_FLAGS "${SIRE_CXX_NG_FLAGS} ${SLASH_HYPHEN}std${COLON_EQUALS}c++14 ${SLASH_HYPHEN}DSIRE_HAS_CPP_14 ${SLASH_HYPHEN}DSIRE_HAS_CPP_1Y ${SLASH_HYPHEN}DSIRE_HAS_CPP_11")
+  set(SIRE_CXX_STANDARD 14)
 
   if (NEED_UNDEF_STRICT_ANSI)
     message( STATUS "Undefining __STRICT_ANSI__ because of compile problems")
@@ -442,6 +446,10 @@ else()
 endif()
 
 save_sire_variable( "SIRE_CXX_NG_FLAGS" "${SIRE_CXX_NG_FLAGS}" )
+save_sire_variable( "SIRE_CXX_STANDARD" "${SIRE_CXX_STANDARD}" )
+
+message( STATUS "Setting CMAKE_CXX_STANDARD to ${SIRE_CXX_STANDARD}" )
+set(CMAKE_CXX_STANDARD ${SIRE_CXX_STANDARD})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIRE_CXX_NG_FLAGS}")
 
@@ -469,8 +477,7 @@ if ( ${SIRE_CXX_COMPILER_ID} MATCHES "GNU" )
     # get the compiler version (via gcc -dumpversion)
     # (I'll assume that we are using the same version
     # of compiler for C and C++...)
-    EXEC_PROGRAM( ${CMAKE_CXX_COMPILER}
-                  ARGS -dumpversion
+    EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
                   OUTPUT_VARIABLE exe_output )
 
     # These two regexps are copied from the Chicken CMake

corelib/build/cmake/FindGSL.cmake

@@ -1,16 +1,16 @@
-# 
-# Try to find gnu scientific library GSL  
+#
+# Try to find gnu scientific library GSL
 # (see http://www.gnu.org/software/gsl/)
-# Once run this will define: 
-# 
+# Once run this will define:
+#
 # GSL_FOUND       = system has GSL lib
 #
 # GSL_LIBRARIES   = full path to the libraries
 #    on Unix/Linux with additional linker flags from "gsl-config --libs"
-# 
+#
 # CMAKE_GSL_CXX_FLAGS  = Unix compiler flags for GSL, essentially "`gsl-config --cxxflags`"
 #
-# GSL_INCLUDE_DIR      = where to find headers 
+# GSL_INCLUDE_DIR      = where to find headers
 #
 # GSL_LINK_DIRECTORIES = link directories, useful for rpath on Unix
 # GSL_EXE_LINKER_FLAGS = rpath on Unix
@@ -24,11 +24,11 @@
 # --------------------------------
 
 IF (NOT WIN32)
-  SET(GSL_CONFIG_PREFER_PATH 
+  SET(GSL_CONFIG_PREFER_PATH
   "$ENV{GSL_DIR}/bin"
   "$ENV{GSL_DIR}"
-  "$ENV{GSL_HOME}/bin" 
-  "$ENV{GSL_HOME}" 
+  "$ENV{GSL_HOME}/bin"
+  "$ENV{GSL_HOME}"
   CACHE STRING "preferred path to GSL (gsl-config)")
   FIND_PROGRAM(GSL_CONFIG gsl-config
     ${GSL_CONFIG_PREFER_PATH}
@@ -37,38 +37,38 @@ IF (NOT WIN32)
     )
   #MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}")
 
-  IF (GSL_CONFIG) 
+  IF (GSL_CONFIG)
     # set CXXFLAGS to be fed into CXX_FLAGS by the user:
-    EXEC_PROGRAM( ${GSL_CONFIG}
-                  ARGS --cflags
-                  OUTPUT_VARIABLE GSL_CXXFLAGS)
-    
+    EXECUTE_PROCESS( COMMAND ${GSL_CONFIG} --cflags
+                  OUTPUT_VARIABLE GSL_CXXFLAGS
+                  OUTPUT_STRIP_TRAILING_WHITESPACE )
+
     # set INCLUDE_DIRS to prefix+include
-    EXEC_PROGRAM(${GSL_CONFIG}
-      ARGS --prefix
+    EXECUTE_PROCESS( COMMAND ${GSL_CONFIG} --prefix
       OUTPUT_VARIABLE GSL_PREFIX)
     SET(GSL_INCLUDE_DIR ${GSL_PREFIX}/include CACHE STRING INTERNAL)
 
     # set link libraries and link flags
-    EXEC_PROGRAM( ${GSL_CONFIG}
-                  ARGS --libs-without-cblas
-                  OUTPUT_VARIABLE GSL_LIBRARIES )     
+    EXECUTE_PROCESS( COMMAND ${GSL_CONFIG}
+                  --libs-without-cblas
+                  OUTPUT_VARIABLE GSL_LIBRARIES 
+                  OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-    # extract link dirs for rpath  
-    EXEC_PROGRAM(${GSL_CONFIG}
-      ARGS --libs
-      OUTPUT_VARIABLE GSL_CONFIG_LIBS )
+    # extract link dirs for rpath
+    EXECUTE_PROCESS( COMMAND ${GSL_CONFIG} --libs
+      OUTPUT_VARIABLE GSL_CONFIG_LIBS 
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
 
     # split off the link dirs (for rpath)
     # use regular expression to match wildcard equivalent "-L*<endchar>"
     # with <endchar> is a space or a semicolon
-    STRING(REGEX MATCHALL "[-][L]([^ ;])+" 
-      GSL_LINK_DIRECTORIES_WITH_PREFIX 
+    STRING(REGEX MATCHALL "[-][L]([^ ;])+"
+      GSL_LINK_DIRECTORIES_WITH_PREFIX
       "${GSL_CONFIG_LIBS}" )
       #      MESSAGE("DBG  GSL_LINK_DIRECTORIES_WITH_PREFIX=${GSL_LINK_DIRECTORIES_WITH_PREFIX}")
 
     # remove prefix -L because we need the pure directory for LINK_DIRECTORIES
-    
+
     IF (GSL_LINK_DIRECTORIES_WITH_PREFIX)
       STRING(REGEX REPLACE "[-][L]" "" GSL_LINK_DIRECTORIES ${GSL_LINK_DIRECTORIES_WITH_PREFIX} )
     ENDIF (GSL_LINK_DIRECTORIES_WITH_PREFIX)
@@ -86,7 +86,7 @@ IF (NOT WIN32)
       GSL_DEFINITIONS
     )
     MESSAGE(STATUS "Using GSL from ${GSL_PREFIX}")
-    
+
   ELSE(GSL_CONFIG)
     MESSAGE("FindGSL.cmake: gsl-config not found. Please set it manually. GSL_CONFIG=${GSL_CONFIG}")
   ENDIF(GSL_CONFIG)
@@ -104,6 +104,6 @@ IF(GSL_LIBRARIES)
   IF(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS)
 
     SET(GSL_FOUND 1)
-    
+
   ENDIF(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS)
 ENDIF(GSL_LIBRARIES)