From fd52de0c6b6aa690ba84a30b5832e03e0a7131db Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Mon, 9 Dec 2019 07:30:34 -0800 Subject: [PATCH] Add FMT_CUDA_TEST CMake option to enable cuda-test --- CMakeLists.txt | 1 + test/CMakeLists.txt | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a17358f..3b6b79ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT}) option(FMT_INSTALL "Generate the install target." ${MASTER_PROJECT}) option(FMT_TEST "Generate the test target." ${MASTER_PROJECT}) option(FMT_FUZZ "Generate the fuzz target." OFF) +option(FMT_CUDA_TEST "Generate the cuda-test target." OFF) project(FMT CXX) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8aab2c91..2fee2125 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -229,20 +229,22 @@ if (FMT_PEDANTIC AND NOT WIN32) "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif () -# Activate optional CUDA tests if CUDA is found. For version selection, see +# Activate optional CUDA tests if CUDA is found. For version selection see # https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#cpp14-language-features -if (${CMAKE_VERSION} VERSION_LESS 3.15) - find_package(CUDA 9.0) -else () - include(CheckLanguage) - check_language(CUDA) - if (CMAKE_CUDA_COMPILER) - enable_language(CUDA OPTIONAL) - set(CUDA_FOUND TRUE) +if (FMT_CUDA_TEST) + if (${CMAKE_VERSION} VERSION_LESS 3.15) + find_package(CUDA 9.0) + else () + include(CheckLanguage) + check_language(CUDA) + if (CMAKE_CUDA_COMPILER) + enable_language(CUDA OPTIONAL) + set(CUDA_FOUND TRUE) + endif () + endif () + + if (CUDA_FOUND) + add_subdirectory(cuda-test) + add_test(NAME cuda-test COMMAND fmt-in-cuda-test) endif () endif () - -if (CUDA_FOUND) - add_subdirectory(cuda-test) - add_test(NAME cuda-test COMMAND fmt-in-cuda-test) -endif ()