summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-23 12:55:14 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-23 12:55:27 (GMT)
commit7470ee3e0553653e98224b5acb1229f9c5c01848 (patch)
tree51a1ef2d606bb5ebdae22c2a20ef68241e47ecd9
parentfd2aa87278b06b996a8843e0cb1b17d9e8a94716 (diff)
parent1d9009c27a5999f7793871e7f034ecdc3e8b280d (diff)
downloadCMake-7470ee3e0553653e98224b5acb1229f9c5c01848.zip
CMake-7470ee3e0553653e98224b5acb1229f9c5c01848.tar.gz
CMake-7470ee3e0553653e98224b5acb1229f9c5c01848.tar.bz2
Merge topic 'cuda-rules-override'
1d9009c27a CUDA: Implement CMAKE_USER_MAKE_RULES_OVERRIDE[_CUDA] Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6253
-rw-r--r--Modules/CMakeCUDAInformation.cmake19
1 files changed, 19 insertions, 0 deletions
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index 541d207..a2946f4 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -36,6 +36,25 @@ if(CMAKE_CUDA_COMPILER_ID)
endif()
+# This should be included before the _INIT variables are
+# used to initialize the cache. Since the rule variables
+# have if blocks on them, users can still define them here.
+# But, it should still be after the platform file so changes can
+# be made to those values.
+
+if(CMAKE_USER_MAKE_RULES_OVERRIDE)
+ # Save the full path of the file so try_compile can use it.
+ include(${CMAKE_USER_MAKE_RULES_OVERRIDE} RESULT_VARIABLE _override)
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${_override}")
+endif()
+
+if(CMAKE_USER_MAKE_RULES_OVERRIDE_CUDA)
+ # Save the full path of the file so try_compile can use it.
+ include(${CMAKE_USER_MAKE_RULES_OVERRIDE_CUDA} RESULT_VARIABLE _override)
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CUDA "${_override}")
+endif()
+
+
if(NOT CMAKE_SHARED_LIBRARY_RUNTIME_CUDA_FLAG)
set(CMAKE_SHARED_LIBRARY_RUNTIME_CUDA_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
endif()