From 57229a0e1d66c505935042a76d760b81e0e273a6 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Sun, 5 Nov 2017 21:12:55 -0500 Subject: [PATCH] Fix a bug in cmake when using CUDA. If CUDA_SEPARABLE_COMPILATION is ON, we need to also use CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS. Otherwise the flags are not passed correctly during the linking phase. So we turn CUDA_SEPARABLE_COMPILATION OFF to fix this problem. --- cmake/macros/macro_deal_ii_add_library.cmake | 2 +- cmake/macros/macro_deal_ii_insource_setup_target.cmake | 2 +- cmake/macros/macro_deal_ii_setup_target.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake index 69db8c7031..c6a0c8bdca 100644 --- a/cmake/macros/macro_deal_ii_add_library.cmake +++ b/cmake/macros/macro_deal_ii_add_library.cmake @@ -81,7 +81,7 @@ MACRO(DEAL_II_ADD_LIBRARY _library) ) SET_TARGET_PROPERTIES(${_library}_${_build_lowercase} PROPERTIES - CUDA_SEPARABLE_COMPILATION TRUE + CUDA_SEPARABLE_COMPILATION FALSE ) ENDIF() diff --git a/cmake/macros/macro_deal_ii_insource_setup_target.cmake b/cmake/macros/macro_deal_ii_insource_setup_target.cmake index 5c7181861c..fb19f757f5 100644 --- a/cmake/macros/macro_deal_ii_insource_setup_target.cmake +++ b/cmake/macros/macro_deal_ii_insource_setup_target.cmake @@ -81,7 +81,7 @@ MACRO(DEAL_II_INSOURCE_SETUP_TARGET _target _build) ) SET_TARGET_PROPERTIES(${_target} PROPERTIES - CUDA_SEPARABLE_COMPILATION TRUE + CUDA_SEPARABLE_COMPILATION FALSE ) ENDIF() ENDIF() diff --git a/cmake/macros/macro_deal_ii_setup_target.cmake b/cmake/macros/macro_deal_ii_setup_target.cmake index f642a3f92e..981b2ae8f6 100644 --- a/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/cmake/macros/macro_deal_ii_setup_target.cmake @@ -152,7 +152,7 @@ MACRO(DEAL_II_SETUP_TARGET _target) ) SET_TARGET_PROPERTIES(${_target} PROPERTIES - CUDA_SEPARABLE_COMPILATION TRUE + CUDA_SEPARABLE_COMPILATION FALSE ) ENDIF() ENDIF() -- 2.39.5