From fcf7ba8f3bf74196242e15997884f127077e23df Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Tue, 23 Jul 2024 13:49:20 -0400 Subject: [PATCH] Small CML fixes --- CMakeLists.txt | 4 +--- test/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e3a84597..d05c44a9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,10 +45,8 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") add_subdirectory(test) -endif() - # Only enable tests when we're the root project -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +elseif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) include(CTest) add_subdirectory(test) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4eba56701..78d8fd4c3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -15,7 +15,7 @@ if(HAVE_BOOST_TEST) enable_testing() - boost_test_jamfile(FILE cuda_jamfile LINK_LIBRARIES Boost::cuda_math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework ) + boost_test_jamfile(FILE cuda_jamfile LINK_LIBRARIES Boost::math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework ) elseif (BOOST_MATH_ENABLE_SYCL) message(STATUS "Building boost.cuda_math with SYCL") @@ -25,7 +25,7 @@ if(HAVE_BOOST_TEST) enable_testing() - boost_test_jamfile(FILE sycl_jamfile LINK_LIBRARIES Boost::cuda_math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework sycl COMPILE_OPTIONS -fsycl ) + boost_test_jamfile(FILE sycl_jamfile LINK_LIBRARIES Boost::math Boost::assert Boost::concept_check Boost::config Boost::core Boost::integer Boost::lexical_cast Boost::multiprecision Boost::predef Boost::random Boost::static_assert Boost::throw_exception Boost::unit_test_framework sycl COMPILE_OPTIONS -fsycl ) else() add_subdirectory(compile_test)