-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Correct re-root controls from conda-forge with thrust/cub/etc (#431)
Upstream fix: https://github.com/NVIDIA/thrust/issues/1966 Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Bradley Dice (https://github.com/bdice) - Vyas Ramasubramani (https://github.com/vyasr) URL: #431
- Loading branch information
1 parent
6f59951
commit 052d184
Showing
3 changed files
with
70 additions
and
1 deletion.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
diff --git a/dependencies/cub/cub/cmake/cub-header-search.cmake b/dependencies/cub/cub/cmake/cub-header-search.cmake | ||
index 2ff1a8acd8..5e731f2be8 100644 | ||
--- a/dependencies/cub/cub/cmake/cub-header-search.cmake | ||
+++ b/dependencies/cub/cub/cmake/cub-header-search.cmake | ||
@@ -1,5 +1,6 @@ | ||
unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search | ||
find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh | ||
+ NO_CMAKE_FIND_ROOT_PATH | ||
NO_DEFAULT_PATH # Only search explicit paths below: | ||
PATHS | ||
"${CMAKE_CURRENT_LIST_DIR}/../.." # Source tree | ||
diff --git a/dependencies/cub/cub/cmake/cub-header-search.cmake.in b/dependencies/cub/cub/cmake/cub-header-search.cmake.in | ||
index 271b1b27bd..3bd10e4b70 100644 | ||
--- a/dependencies/cub/cub/cmake/cub-header-search.cmake.in | ||
+++ b/dependencies/cub/cub/cmake/cub-header-search.cmake.in | ||
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../") | ||
list(JOIN from_install_prefix "" from_install_prefix) | ||
|
||
find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh | ||
+ NO_CMAKE_FIND_ROOT_PATH | ||
NO_DEFAULT_PATH # Only search explicit paths below: | ||
PATHS | ||
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" | ||
diff --git a/thrust/cmake/thrust-header-search.cmake b/thrust/cmake/thrust-header-search.cmake | ||
index 643ec90b7..7d27c68f4 100644 | ||
--- a/thrust/cmake/thrust-header-search.cmake | ||
+++ b/thrust/cmake/thrust-header-search.cmake | ||
@@ -1,6 +1,7 @@ | ||
# Parse version information from version.h: | ||
unset(_THRUST_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search | ||
find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h | ||
+ NO_CMAKE_FIND_ROOT_PATH | ||
NO_DEFAULT_PATH # Only search explicit paths below: | ||
PATHS | ||
"${CMAKE_CURRENT_LIST_DIR}/../.." # Source tree | ||
diff --git a/thrust/cmake/thrust-header-search.cmake.in b/thrust/cmake/thrust-header-search.cmake.in | ||
index c014c469b..adea07e2d 100644 | ||
--- a/thrust/cmake/thrust-header-search.cmake.in | ||
+++ b/thrust/cmake/thrust-header-search.cmake.in | ||
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../") | ||
list(JOIN from_install_prefix "" from_install_prefix) | ||
|
||
find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h | ||
+ NO_CMAKE_FIND_ROOT_PATH | ||
NO_DEFAULT_PATH # Only search explicit paths below: | ||
PATHS | ||
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in | ||
index 8c44d990..365b9de0 100644 | ||
--- a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in | ||
+++ b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in | ||
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../") | ||
list(JOIN from_install_prefix "" from_install_prefix) | ||
|
||
find_path(_libcudacxx_VERSION_INCLUDE_DIR cuda/std/detail/__config | ||
+ NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search | ||
NO_DEFAULT_PATH # Only search explicit paths below: | ||
PATHS | ||
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" # Install tree |
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