Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More stable package find instructions #878

Merged
merged 3 commits into from
Apr 17, 2023
Merged

More stable package find instructions #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4cbfbb
add explicit location of double-down configs
ebknudsen Apr 17, 2023
106d851
protect search dirs var. Can fail on some platforms otherwise
ebknudsen Apr 17, 2023
65efeba
update changelog fixed cmake search paths
ebknudsen Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/FindDOUBLE_DOWN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindMOAB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down