Skip to content

Commit

Permalink
Merge pull request #268 from LLNL/bugfix/improve_target_export
Browse files Browse the repository at this point in the history
Improve target export
  • Loading branch information
ldowen authored Mar 21, 2024
2 parents 5d5063e + 4212e80 commit ea0df9b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Notable changes include:
State and StateDerivatives object).

* Build changes / improvements:
*
* Improved the target export functionality.

* Bug Fixes / improvements:
* Fixed bug with ConstantBoundary in the presence of porosity with the new porosity models introduced in v2024.01.00.
Expand Down
22 changes: 21 additions & 1 deletion cmake/spheral_cxx-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,29 @@
if(NOT axom_DIR)
set(axom_DIR "@axom_DIR@" CACHE PATH "")
endif()
set(SPHERAL_BLT_DIR "@SPHERAL_BLT_DIR@")
set(SPHERAL_CXX_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set(SPHERAL_CXX_INCLUDE_DIRS "${SPHERAL_CXX_INSTALL_PREFIX}/include")
if(NOT @ENABLE_CXXONLY@ AND NOT TARGET Python3)
set(python_DIR "@python_DIR@")
set(Python_EXECUTABLE ${python_DIR}/bin/python3)
set(Python3_EXECUTABLE ${python_DIR}/bin/python3)
find_package(Python3 COMPONENTS Interpreter Development)
set(PYTHON_EXE ${Python3_EXECUTABLE})
endif()

# Guard these assignments to not interfere with projects that use Spheral and SpheralC as TPLs
if(SPHERALC_STANDALONE)
set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Spheral C compiler path")
set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE PATH "Spheral C++ compiler path")
set(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@" CACHE PATH "Spheral C++ compiler path")
set(ENABLE_MPI @ENABLE_MPI@ CACHE BOOL "")
if(SPHERAL_ENABLE_MPI)
set(MPI_C_COMPILER "@MPI_C_COMPILER@" CACHE PATH "")
set(MPI_CXX_COMPILER "@MPI_CXX_COMPILER@" CACHE PATH "")
set(MPI_Fortran_COMPILER "@MPI_Fortran_COMPILER@" CACHE PATH "")
endif()
endif()

if(NOT TARGET axom)
find_package(axom REQUIRED QUIET NO_DEFAULT_PATH PATHS ${axom_DIR} ${axom_DIR}/lib ${axom_DIR}/lib/cmake)
endif()
Expand Down

0 comments on commit ea0df9b

Please sign in to comment.