matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cmake CUDA target defines

Browse Source
This commit is contained in:
Bartek Kryza
2024-05-01 21:27:33 +02:00
parent 35b66beeca
commit 1a3d1c19cf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -162,9 +162,6 @@ option(ENABLE_CUDA_TEST_CASES "" OFF)
if(ENABLE_CUDA_TEST_CASES) if(ENABLE_CUDA_TEST_CASES)
include(CheckLanguage) include(CheckLanguage)
check_language(CUDA) check_language(CUDA)
if(DEFINED CMAKE_CUDA_COMPILER)
set(ENABLE_CUDA_TEST_CASES ON)
endif(DEFINED CMAKE_CUDA_COMPILER)
endif(ENABLE_CUDA_TEST_CASES) endif(ENABLE_CUDA_TEST_CASES)
if(BUILD_TESTS) if(BUILD_TESTS)

5
tests/CMakeLists.txt
View File

@@ -32,7 +32,7 @@ else()
endif(ENABLE_CXX_MODULES_TEST_CASES) endif(ENABLE_CXX_MODULES_TEST_CASES)
if(NOT ENABLE_CUDA_TEST_CASES) if(NOT ENABLE_CUDA_TEST_CASES)
message(STATUS "Enabling CUDA test cases") message(STATUS "Disabling CUDA test cases")
foreach(CUDA_TC ${TEST_CASES_REQUIRING_CUDA}) foreach(CUDA_TC ${TEST_CASES_REQUIRING_CUDA})
list(FILTER TEST_CASE_SOURCES list(FILTER TEST_CASE_SOURCES
EXCLUDE EXCLUDE
@@ -112,7 +112,8 @@ foreach(TEST_NAME ${TEST_NAMES})
$<IF:${ENABLE_CXX_STD_20_TEST_CASES},cxx_std_20,cxx_std_17>) $<IF:${ENABLE_CXX_STD_20_TEST_CASES},cxx_std_20,cxx_std_17>)
target_compile_definitions(${TEST_NAME} PRIVATE target_compile_definitions(${TEST_NAME} PRIVATE
$<$<EQUAL:${ENABLE_CXX_STD_20_TEST_CASES},1>:ENABLE_CXX_STD_20_TEST_CASES> $<$<EQUAL:${ENABLE_CXX_STD_20_TEST_CASES},1>:ENABLE_CXX_STD_20_TEST_CASES>
$<$<BOOL:${ENABLE_CXX_MODULES_TEST_CASES}>:ENABLE_CXX_MODULES_TEST_CASES>) $<$<BOOL:${ENABLE_CXX_MODULES_TEST_CASES}>:ENABLE_CXX_MODULES_TEST_CASES>
$<$<BOOL:${ENABLE_CUDA_TEST_CASES}>:ENABLE_CUDA_TEST_CASES>)
target_compile_options(${TEST_NAME} PRIVATE target_compile_options(${TEST_NAME} PRIVATE
$<$<COMPILE_LANGUAGE:CXX>: $<$<COMPILE_LANGUAGE:CXX>:
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>: $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:

2
tests/test_cases.cc
View File

@@ -475,9 +475,11 @@ using namespace clanguml::test::matchers;
#include "t20046/test_case.h" #include "t20046/test_case.h"
#include "t20047/test_case.h" #include "t20047/test_case.h"
#include "t20048/test_case.h" #include "t20048/test_case.h"
#if defined(ENABLE_CUDA_TEST_CASES)
#include "t20049/test_case.h" #include "t20049/test_case.h"
#include "t20050/test_case.h" #include "t20050/test_case.h"
#include "t20051/test_case.h" #include "t20051/test_case.h"
#endif
/// ///
/// Package diagram tests /// Package diagram tests