From 276baf0395b5e45570c11a439ea53ffb625949e6 Mon Sep 17 00:00:00 2001 From: Ben Cumming <bcumming@cscs.ch> Date: Wed, 21 Nov 2018 11:21:20 +0100 Subject: [PATCH] Forward cuda header paths to host compiler (#652) * Forward CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES to compilation of arbor library and unit tests. Fixes #651 --- CMakeLists.txt | 1 - arbor/CMakeLists.txt | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9802b68..eeafe753 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,6 @@ if(ARB_WITH_GPU) target_compile_options(arbor-private-deps INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-gencode=arch=compute_37,code=sm_37>) target_compile_options(arbor-private-deps INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-gencode=arch=compute_60,code=sm_60>) target_compile_options(arbor-private-deps INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-gencode=arch=compute_70,code=sm_70>) - endif() # Use libunwind if available for pretty printing stack traces diff --git a/arbor/CMakeLists.txt b/arbor/CMakeLists.txt index 87ec5150..6664cb56 100644 --- a/arbor/CMakeLists.txt +++ b/arbor/CMakeLists.txt @@ -92,6 +92,10 @@ add_library(arbor-private-headers INTERFACE) target_include_directories(arbor-private-headers INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>") +if(ARB_WITH_GPU) + target_include_directories(arbor-private-headers INTERFACE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) +endif() + install(TARGETS arbor-private-headers EXPORT arbor-targets) # Mechanisms, generated from .mod files; sets arbor_mechanism_sources -- GitLab