From 7781f865cb6cc3faff3b1dfce557439abe3b56b9 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 6 Apr 2016 09:35:23 -0700 Subject: [PATCH] Renamed the EIGEN_TEST_NVCC cmake option into EIGEN_TEST_CUDA per the discussion in bug #1173. --- cmake/EigenTesting.cmake | 2 +- test/CMakeLists.txt | 8 ++++---- unsupported/test/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index 1709e0334..d5e3972b5 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -315,7 +315,7 @@ macro(ei_testing_print_summary) message(STATUS "C++11: OFF") endif() - if(EIGEN_TEST_NVCC) + if(EIGEN_TEST_CUDA) message(STATUS "CUDA: ON") else() message(STATUS "CUDA: OFF") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4420e0c51..841c4572b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -325,9 +325,9 @@ if(EIGEN_TEST_EIGEN2) endif() -# NVCC unit tests -option(EIGEN_TEST_NVCC "Enable NVCC support in unit tests" OFF) -if(EIGEN_TEST_NVCC) +# CUDA unit tests +option(EIGEN_TEST_CUDA "Enable CUDA support in unit tests" OFF) +if(EIGEN_TEST_CUDA) find_package(CUDA 5.0) if(CUDA_FOUND) @@ -345,7 +345,7 @@ if(CUDA_FOUND) endif(CUDA_FOUND) -endif(EIGEN_TEST_NVCC) +endif(EIGEN_TEST_CUDA) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/failtests) diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 6bd8cfb92..7972e6776 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -175,7 +175,7 @@ endif() # These tests needs nvcc find_package(CUDA 7.0) -if(CUDA_FOUND AND EIGEN_TEST_NVCC) +if(CUDA_FOUND AND EIGEN_TEST_CUDA) # Make sure to compile without the -pedantic, -Wundef, -Wnon-virtual-dtor # and -fno-check-new flags since they trigger thousands of compilation warnings # in the CUDA runtime