Merge pull request #802 from pshriwise/cmake-dir

DAGMC CMake configuration directory
svalinn · Apr 9, 2022 · 91633d3 · 91633d3
2 parents 1f8b597 + abe9755
commit 91633d3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/CI/scripts/build_dagmc.sh b/CI/scripts/build_dagmc.sh
@@ -41,6 +41,7 @@ function build_dagmc() {
  -DBUILD_CI_TESTS=ON \
  -DBUILD_MW_REG_TESTS=${build_mw_reg_tests} \
  -DBUILD_STATIC_EXE=${static_exe} \
+ -DBUILD_STATIC_LIBS=${static_exe} \
  -DCMAKE_C_COMPILER=${CC} \
  -DCMAKE_CXX_COMPILER=${CXX} \
  -DCMAKE_Fortran_COMPILER=${FC} \

diff --git a/cmake/DAGMCConfig.cmake.in b/cmake/DAGMCConfig.cmake.in
@@ -28,4 +28,4 @@ if(@DOUBLE_DOWN@)
  HINTS @dd_CMAKE_CONFIG@)
 endif()
 
-include(@CMAKE_INSTALL_PREFIX@/lib/cmake/DAGMCTargets.cmake)
+include(@CMAKE_INSTALL_PREFIX@/lib/cmake/dagmc/DAGMCTargets.cmake)
diff --git a/cmake/DAGMC_macros.cmake b/cmake/DAGMC_macros.cmake
@@ -63,7 +63,7 @@ macro (dagmc_setup_options)
  option(BUILD_CI_TESTS "Build everything needed to run the CI tests" OFF)
 
  option(BUILD_SHARED_LIBS "Build shared libraries" ON)
- option(BUILD_STATIC_LIBS "Build static libraries" ON)
+ option(BUILD_STATIC_LIBS "Build static libraries" OFF)
 
  option(BUILD_EXE "Build DAGMC executables" ON)
  option(BUILD_STATIC_EXE "Build static executables" OFF)
@@ -203,13 +203,13 @@ endmacro ()
 # Setup the configuration file and install
 macro (dagmc_make_configure_files)
  message("")
- message(STATUS "DAGMC cmake config file: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/cmake/DAGMCConfig.cmake")
- message(STATUS "DAGMC cmake version file: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/cmake/DAGMCConfigVersion.cmake")
+ message(STATUS "DAGMC cmake config file: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/cmake/dagmc/DAGMCConfig.cmake")
+ message(STATUS "DAGMC cmake version file: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/cmake/dagmc/DAGMCConfigVersion.cmake")
  configure_file(cmake/DAGMCConfig.cmake.in DAGMCConfig.cmake @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DAGMCConfig.cmake DESTINATION ${INSTALL_LIB_DIR}/cmake/)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DAGMCConfig.cmake DESTINATION ${INSTALL_LIB_DIR}/cmake/dagmc/)
  configure_file(cmake/DAGMCConfigVersion.cmake.in DAGMCConfigVersion.cmake @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DAGMCConfigVersion.cmake DESTINATION ${INSTALL_LIB_DIR}/cmake/)
- install(EXPORT DAGMCTargets DESTINATION ${INSTALL_LIB_DIR}/cmake/)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DAGMCConfigVersion.cmake DESTINATION ${INSTALL_LIB_DIR}/cmake/dagmc)
+ install(EXPORT DAGMCTargets DESTINATION ${INSTALL_LIB_DIR}/cmake/dagmc)
 endmacro ()
 
 # To use the dagmc_install macros, the following lists must be defined:

diff --git a/cmake/FindDAGMC.cmake b/cmake/FindDAGMC.cmake
@@ -12,7 +12,7 @@ message(STATUS ${DAGMC_ROOT})
 find_path(DAGMC_CMAKE_CONFIG NAMES DAGMCConfig.cmake
  HINTS ${DAGMC_ROOT} $ENV{DAGMC_ROOT}
  PATHS ENV LD_LIBRARY_PATH
- PATH_SUFFIXES lib Lib cmake lib/cmake/
+ PATH_SUFFIXES lib Lib cmake lib/cmake/dagmc
  NO_DEFAULT_PATH)
 
 message(STATUS "Found DAGMC in ${DAGMC_CMAKE_CONFIG}")

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -7,6 +7,12 @@ DAGMC Changelog
 Next version
 ====================
 
+**Changed:**
+
+ * Placing installed CMake configuration files in project directory (#802)
+ * Removing build of static libs as a default option (#802)
+
+
 v3.2.1
 ====================