hotfix v2023.03.2 (#229)

* Extra rpaths.

* find file behaviour switch for cmake 3.21+.

* 2023.03.2 release notes.

* docs version.

Author: mdavis36

RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+Version v2023.03.2 -- Release date 2023-07-03
+=============================================
+
+This is a patch release. It brings in further TOSS4 related fixes.
+
+Note:
+  This release fails to install py-scipy spack dependency for clang v14.0.6, LC release builds are installed w/ gcc.
+  The clang spack build will not be fixed for this patch release.
+
 Version v2023.03.1 -- Release date 2023-06-20
 =============================================
 

cmake/spheral/SpheralAddLibs.cmake

@@ -113,7 +113,7 @@ function(spheral_add_cxx_library
 
   # Set the r-path of the C++ lib such that it is independent of the build dir when installed
   set_target_properties(Spheral_${package_name} PROPERTIES
-                        INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${conduit_DIR}/lib;${axom_DIR}/lib;${boost_DIR}/lib;${hdf5_DIR}/lib"
+    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${conduit_DIR}/lib;${axom_DIR}/lib;${boost_DIR}/lib;${hdf5_DIR}/lib;${EXTRA_RPATHS}"
                         )
 endfunction()
 
@@ -161,7 +161,7 @@ function(spheral_add_pybind11_library package_name)
 
   # Set the r-path of the C++ lib such that it is independent of the build dir when installed
   set_target_properties(${MODULE_NAME} PROPERTIES
-    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${conduit_DIR}/lib;${axom_DIR}/lib;${boost_DIR}/lib;${python_DIR}/lib;${hdf5_DIR}/lib"
+    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${conduit_DIR}/lib;${axom_DIR}/lib;${boost_DIR}/lib;${python_DIR}/lib;${hdf5_DIR}/lib;${EXTRA_RPATHS}"
                         )
 
 endfunction()

cmake/spheral/SpheralHandleTPL.cmake

@@ -90,7 +90,14 @@ function(Spheral_Handle_TPL lib_name dep_list target_type)
     else()
       message("Found: ${temp_abs_path}")
     endif()
-    unset(temp_abs_path CACHE) # Remove this line when using cmake 3.21+, same as find_file(NO_CACHE)
+    
+    # find_file treats output as a standard variable from 3.21+ We get different behavior on later CMake versions.
+    if(${CMAKE_VERSION} VERSION_LESS "3.21.0")
+      unset(temp_abs_path CACHE)
+    else()
+      unset(temp_abs_path)
+    endif()
+
   endforeach()
 
   # Register any libs/includes under a blt dir for later use/depends

docs/conf.py

@@ -26,9 +26,9 @@
 author = u'J. Michael Owen'
 
 # The short X.Y version
-version = u'2022.06.0'
+version = u'2023.03.2'
 # The full version, including alpha/beta/rc tags
-release = u'2022.06.0'
+release = u'2023.03.2'
 
 
 # -- General configuration ---------------------------------------------------

docs/conf.py.in

@@ -26,9 +26,9 @@ copyright = u'2012, LLNS'
 author = u'J. Michael Owen'
 
 # The short X.Y version
-version = u'1.0'
+version = u'2023.03.2'
 # The full version, including alpha/beta/rc tags
-release = u'2022.6.1'
+release = u'2023.03.2'
 
 
 # -- General configuration ---------------------------------------------------