Retain the original path to Kokkos and ArborX #723
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
junghans
requested changes
Dec 11, 2023
| find_package(Kokkos QUIET) | ||
| if(NOT Kokkos_FOUND) | ||
| # If Kokkos was not found, try to use Kokkos used when building Cabana | ||
| set(Kokkos_DIR @Kokkos_DIR@) |
There was a problem hiding this comment.
Suggested change
| set(Kokkos_DIR @Kokkos_DIR@) | |
| if(NOT Kokkos_DIR) | |
| set(Kokkos_DIR @Kokkos_DIR@) | |
| endif() |
So the user can still overwrite it if needed.
| if(NOT Kokkos_FOUND) | ||
| # If Kokkos was not found, try to use Kokkos used when building Cabana | ||
| set(Kokkos_DIR @Kokkos_DIR@) | ||
| find_dependency(Kokkos) |
There was a problem hiding this comment.
Suggested change
| find_dependency(Kokkos) | |
| find_dependency(Kokkos REQUIRED) |
| @@ -12,14 +12,24 @@ | |||
| include(CMakeFindDependencyMacro) | |||
| list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" ) | |||
| list(APPEND CMAKE_PREFIX_PATH @CMAKE_PREFIX_PATH@) | |||
| find_dependency(Kokkos REQUIRED) | |||
| find_package(Kokkos QUIET) | |||
There was a problem hiding this comment.
Suggested change
| find_package(Kokkos QUIET) | |
| find_dependency(Kokkos) |
find_dependency handles QUIET automatically.
| set(Cabana_ENABLE_MPI @Cabana_ENABLE_MPI@) | ||
| if(Cabana_ENABLE_MPI) | ||
| find_dependency(MPI REQUIRED CXX) | ||
| endif() | ||
| set(Cabana_ENABLE_ARBORX @Cabana_ENABLE_ARBORX@) | ||
| if(Cabana_ENABLE_ARBORX) | ||
| find_dependency(ArborX REQUIRED) | ||
| find_package(ArborX QUIET) |
There was a problem hiding this comment.
Suggested change
| find_package(ArborX QUIET) | |
| find_dependency(ArborX) |
| find_package(ArborX QUIET) | ||
| if(NOT ArborX_FOUND) | ||
| # If ArborX was not found, try to use ArborX used when building Cabana | ||
| set(ArborX_DIR @ArborX_DIR@) |
There was a problem hiding this comment.
Suggested change
| set(ArborX_DIR @ArborX_DIR@) | |
| if(NOT ArborX_DIR) | |
| set(ArborX_DIR @ArborX_DIR@) | |
| endif() |
| if(NOT ArborX_FOUND) | ||
| # If ArborX was not found, try to use ArborX used when building Cabana | ||
| set(ArborX_DIR @ArborX_DIR@) | ||
| find_dependency(ArborX) |
There was a problem hiding this comment.
Suggested change
| find_dependency(ArborX) | |
| find_dependency(ArborX REQUIRED) |
|
How do you mean we require |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Downstream Cabana libraries require specifying
Kokkos_ROOTandArborX_ROOTright now. This PR allows users to skip that and try to use the directories used during the build. I've only done these two because that's what I tested, but it could be expanded to all others.Similar approach was hardcoded in Cabana at some point, but was removed in #244.