From bb0e73c1914c675755e8fab2a6db168b65a4de51 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Fri, 18 Mar 2016 12:17:37 -0700 Subject: [PATCH] Gate all the CUDA tests under the EIGEN_TEST_NVCC option --- cmake/EigenTesting.cmake | 6 ++++++ unsupported/test/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index 5ca800cfe..c70ec2c24 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -309,6 +309,12 @@ macro(ei_testing_print_summary) message(STATUS "C++11: OFF") endif() + if(EIGEN_TEST_NVCC) + message(STATUS "CUDA: ON") + else() + message(STATUS "CUDA: OFF") + endif() + endif() # vectorization / alignment options message(STATUS "\n${EIGEN_TESTING_SUMMARY}") diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 79c26fb72..19893cc25 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -174,7 +174,7 @@ endif() # These tests needs nvcc find_package(CUDA 7.0) -if(CUDA_FOUND) +if(CUDA_FOUND AND EIGEN_TEST_NVCC) # Mke sure to compile without the -pedantic and -Wundef flags since they trigger thousands of compilation warnings in the CUDA runtime string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REPLACE "-Wundef" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")