From a4cbfbb3ce0f9c137bdc4abbc9fc2d8148171d92 Mon Sep 17 00:00:00 2001 From: Erik B Knudsen Date: Mon, 17 Apr 2023 15:11:44 +0200 Subject: [PATCH 1/3] add explicit location of double-down configs --- cmake/FindDOUBLE_DOWN.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindDOUBLE_DOWN.cmake b/cmake/FindDOUBLE_DOWN.cmake index 82d6eeef5a..d3eaafcab9 100644 --- a/cmake/FindDOUBLE_DOWN.cmake +++ b/cmake/FindDOUBLE_DOWN.cmake @@ -11,7 +11,7 @@ find_path(dd_CMAKE_CONFIG NAMES ddConfig.cmake HINTS ${dd_ROOT} $ENV{dd_ROOT} PATHS ENV LD_LIBRARY_PATH PATHS ${DOUBLE_DOWN_DIR} - PATH_SUFFIXES lib Lib cmake lib/cmake/ + PATH_SUFFIXES lib Lib cmake lib/cmake/ lib/cmake/dd NO_DEFAULT_PATH) message(STATUS "Found dd in ${dd_CMAKE_CONFIG}") From 106d8514d42f8dd64ca992d189cfce05f9e1696c Mon Sep 17 00:00:00 2001 From: Erik B Knudsen Date: Mon, 17 Apr 2023 15:12:23 +0200 Subject: [PATCH 2/3] protect search dirs var. Can fail on some platforms otherwise --- cmake/FindMOAB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake index ff466c7d0b..0cefeb4666 100644 --- a/cmake/FindMOAB.cmake +++ b/cmake/FindMOAB.cmake @@ -4,7 +4,7 @@ message("") # Only used to determine the location of the HDF5 with which MOAB was built set(MOAB_SEARCH_DIRS) file(GLOB MOAB_SEARCH_DIRS ${MOAB_SEARCH_DIRS} "${MOAB_DIR}/lib*/cmake/MOAB") -string(REPLACE "\n" ";" MOAB_SEARCH_DIRS ${MOAB_SEARCH_DIRS}) +string(REPLACE "\n" ";" MOAB_SEARCH_DIRS "${MOAB_SEARCH_DIRS}") find_path(MOAB_CMAKE_CONFIG NAMES MOABConfig.cmake PATHS ${MOAB_SEARCH_DIRS} From 65efeba3eae41b787e59b3929ec195992606e3ab Mon Sep 17 00:00:00 2001 From: Erik B Knudsen Date: Mon, 17 Apr 2023 15:25:02 +0200 Subject: [PATCH 3/3] update changelog fixed cmake search paths --- doc/CHANGELOG.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index a4cedee15a..e993adf10e 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -23,7 +23,8 @@ Next version * Introduced logger to better manage console output (#876) **Fixed:** - * Patch to compile with Geant4 10.6 + * Patch to compile with Geant4 10.6 + * Patched cmake-search paths for double-down and MOAB (#878) v3.2.2