From 18dbd608b486387a0608ef3e70769570cc855e46 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 5 Nov 2020 14:55:53 -0500 Subject: [PATCH] Allow user to specify CMAKE_CUDA_HOST_COMPILER --- cmake/configure/configure_1_cuda.cmake | 4 +++- cmake/macros/macro_deal_ii_invoke_autopilot.cmake | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake index cf9a69e98e..d601439741 100644 --- a/cmake/configure/configure_1_cuda.cmake +++ b/cmake/configure/configure_1_cuda.cmake @@ -160,7 +160,9 @@ MACRO(FEATURE_CUDA_CONFIGURE_EXTERNAL) # compiler: # SET(CMAKE_CUDA_COMPILER "${CUDA_NVCC_EXECUTABLE}") - SET(CMAKE_CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}") + IF(NOT CMAKE_CUDA_HOST_COMPILER) + SET(CMAKE_CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}") + ENDIF() ENABLE_LANGUAGE(CUDA) MARK_AS_ADVANCED(CMAKE_CUDA_HOST_COMPILER) diff --git a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake index 2fe7f4b464..36422dd3ef 100644 --- a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake +++ b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake @@ -46,7 +46,9 @@ MACRO(DEAL_II_INVOKE_AUTOPILOT) # Make sure we can treat CUDA targets if available IF(DEAL_II_WITH_CUDA) - SET(CMAKE_CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}") + IF(NOT CMAKE_CUDA_HOST_COMPILER) + SET(CMAKE_CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}") + ENDIF() ENABLE_LANGUAGE(CUDA) ENDIF() -- 2.39.5