From 6cdd19398380faf11ea8a6496752cf7ec20fafd6 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 12 Jan 2017 10:54:39 -0600 Subject: [PATCH] CMake: Properly propagate all compiler flags to the cuda wrapper --- cmake/configure/configure_1_cuda.cmake | 5 ----- cmake/macros/macro_deal_ii_add_library.cmake | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake index e14fa2c616..aec9028c97 100644 --- a/cmake/configure/configure_1_cuda.cmake +++ b/cmake/configure/configure_1_cuda.cmake @@ -96,11 +96,6 @@ MACRO(FEATURE_CUDA_FIND_EXTERNAL var) STRING(SUBSTRING "${CUDA_COMPUTE_CAPABILITY}" 1 1 CUDA_COMPUTE_CAPABILITY_MINOR) SET(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE FALSE) - - SET(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -std=c++11) - - # FIXME: CUDA compiler NVCC doesn't support C++14. - ENDIF() ENDIF() diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake index 0fc796796d..5a4c900cdf 100644 --- a/cmake/macros/macro_deal_ii_add_library.cmake +++ b/cmake/macros/macro_deal_ii_add_library.cmake @@ -62,9 +62,19 @@ MACRO(DEAL_II_ADD_LIBRARY _library) # Cuda specific target setup: # IF(DEAL_II_WITH_CUDA) + + # + # CUDA_WRAP_SRCS does not automatically pick up host compiler flags + # from the target, so we have to feed relevant flags ourselves + # + SET(CMAKE_CXX_FLAGS + "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" + ) + CUDA_WRAP_SRCS(${_library}_${_build_lowercase} OBJ _generated_cuda_files ${ARGN} SHARED ) + SET(CMAKE_CXX_FLAGS "") ADD_CUSTOM_TARGET(${_library}_${_build_lowercase}_cuda DEPENDS -- 2.39.5