From 33406182a514dad1b103a793bc2471912926bfe7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 25 Sep 2024 15:17:44 -0400 Subject: Tests: Honor CUDAFLAGS in all CUDA tests --- Tests/Cuda/ProperLinkFlags/CMakeLists.txt | 4 ++-- Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Tests/Cuda/ProperLinkFlags/CMakeLists.txt b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt index 862b03b..0ef5c16 100644 --- a/Tests/Cuda/ProperLinkFlags/CMakeLists.txt +++ b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt @@ -9,9 +9,9 @@ project(ProperLinkFlags CUDA CXX) #Specify a set of valid CUDA flags and an invalid set of CXX flags ( for CUDA ) #to make sure we don't use the CXX flags when linking CUDA executables if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") - string(APPEND CMAKE_CUDA_FLAGS "--use_fast_math") + string(APPEND CMAKE_CUDA_FLAGS " --use_fast_math") elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang") - string(APPEND CMAKE_CUDA_FLAGS "-ffast-math") + string(APPEND CMAKE_CUDA_FLAGS " -ffast-math") endif() set(CMAKE_CXX_FLAGS "-Wall") diff --git a/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt b/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt index cf6eef2..89a8de8 100644 --- a/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt +++ b/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt @@ -1,10 +1,6 @@ cmake_minimum_required(VERSION 3.17) -project(SharedRuntimeViaCUDAFlags NONE) - -set(CMAKE_CUDA_FLAGS "") -string(APPEND CMAKE_CUDA_FLAGS "-cudart shared") - -enable_language(CUDA) +set(ENV{CUDAFLAGS} "$ENV{CUDAFLAGS} -cudart shared") +project(SharedRuntimeViaCUDAFlags CUDA) add_executable(CudaOnlySharedRuntimeViaCUDAFlags main.cu) -- cgit v0.12