From 8f24f611f500d5438196f1805e916addb59f3585 Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Fri, 25 Aug 2023 15:51:36 -0500 Subject: [PATCH] attempt to fix CUDA build --- GPUQREngine/CMakeLists.txt | 8 ++++---- SPQR/SPQRGPU/CMakeLists.txt | 12 ++++++------ SuiteSparse_GPURuntime/CMakeLists.txt | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/GPUQREngine/CMakeLists.txt b/GPUQREngine/CMakeLists.txt index 1499bf64d..d9e9ba738 100644 --- a/GPUQREngine/CMakeLists.txt +++ b/GPUQREngine/CMakeLists.txt @@ -167,11 +167,11 @@ set_target_properties ( GPUQREngine PROPERTIES target_include_directories ( GPUQREngine PRIVATE ${CUDAToolkit_INCLUDE_DIRS} ${GPUQRENGINE_INCLUDES} - $ ) + "$" ) if ( SUITESPARSE_CUDA ) target_include_directories ( GPUQREngine PRIVATE - $ ) + "$" ) set_target_properties ( GPUQREngine PROPERTIES POSITION_INDEPENDENT_CODE ON ) set_target_properties ( GPUQREngine PROPERTIES CUDA_SEPARABLE_COMPILATION ON ) @@ -205,11 +205,11 @@ if ( NOT NSTATIC ) target_include_directories ( GPUQREngine_static PRIVATE ${CUDAToolkit_INCLUDE_DIRS} ${GPUQRENGINE_INCLUDES} - $ ) + "$" ) if ( SUITESPARSE_CUDA ) target_include_directories ( GPUQREngine_static PRIVATE - $ ) + "$" ) set_target_properties ( GPUQREngine_static PROPERTIES CUDA_SEPARABLE_COMPILATION on ) set_target_properties ( GPUQREngine_static PROPERTIES POSITION_INDEPENDENT_CODE on ) diff --git a/SPQR/SPQRGPU/CMakeLists.txt b/SPQR/SPQRGPU/CMakeLists.txt index abd8d831b..a2d85d716 100644 --- a/SPQR/SPQRGPU/CMakeLists.txt +++ b/SPQR/SPQRGPU/CMakeLists.txt @@ -71,22 +71,22 @@ include_directories ( ${SPQR_CUDA_INCLUDES} ${CUDAToolkit_INCLUDE_DIRS} ) if ( TARGET SuiteSparse::GPUQREngine ) target_include_directories ( SPQR_CUDA PRIVATE - $ ) + "$" ) target_include_directories ( SPQR_CUDA_static PRIVATE - $ ) + "$" ) endif ( ) if ( TARGET SuiteSparse::GPURuntime ) target_include_directories ( SPQR_CUDA PRIVATE - $ ) + "$" ) target_include_directories ( SPQR_CUDA_static PRIVATE - $ ) + "$" ) endif ( ) target_include_directories ( SPQR_CUDA PRIVATE ${CUDAToolkit_INCLUDE_DIRS} ${SPQR_CUDA_INCLUDES} - $ ) + "$" ) set_target_properties ( SPQR_CUDA PROPERTIES POSITION_INDEPENDENT_CODE ON ) set_target_properties ( SPQR_CUDA PROPERTIES CUDA_SEPARABLE_COMPILATION ON ) @@ -94,7 +94,7 @@ if ( NOT NSTATIC ) target_include_directories ( SPQR_CUDA_static PRIVATE ${CUDAToolkit_INCLUDE_DIRS} ${SPQR_CUDA_INCLUDES} - $ ) + "$" ) set_target_properties ( SPQR_CUDA_static PROPERTIES CUDA_SEPARABLE_COMPILATION on ) set_target_properties ( SPQR_CUDA_static PROPERTIES POSITION_INDEPENDENT_CODE on ) diff --git a/SuiteSparse_GPURuntime/CMakeLists.txt b/SuiteSparse_GPURuntime/CMakeLists.txt index 136ddcc21..33869e408 100644 --- a/SuiteSparse_GPURuntime/CMakeLists.txt +++ b/SuiteSparse_GPURuntime/CMakeLists.txt @@ -102,7 +102,7 @@ target_include_directories ( GPURuntime PRIVATE ${SUITESPARSE_GPURUNTIME_INCLUDES} ) target_include_directories ( GPURuntime PUBLIC - $ ) + "$" ) if ( SUITESPARSE_CUDA ) set_target_properties ( GPURuntime PROPERTIES POSITION_INDEPENDENT_CODE ON ) @@ -139,7 +139,7 @@ if ( NOT NSTATIC ) ${SUITESPARSE_GPURUNTIME_INCLUDES} ) target_include_directories ( GPURuntime_static PUBLIC - $ ) + "$" ) if ( SUITESPARSE_CUDA ) set_target_properties ( GPURuntime_static PROPERTIES CUDA_SEPARABLE_COMPILATION on )