echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Combine conditions for BundleUtilities test

Browse Source
This commit is contained in:
Brad King 2025-03-12 15:15:46 -04:00
parent 6dfd8e19b5
commit 2c28321adb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/CMakeLists.txt
View File

@ -610,11 +610,11 @@ if(BUILD_TESTING)
endif() endif()
# run test for BundleUtilities on supported platforms/compilers # run test for BundleUtilities on supported platforms/compilers
if(MSVC OR if((MSVC OR
MINGW OR MINGW OR
CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Darwin") CMAKE_SYSTEM_NAME MATCHES "Darwin")
if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake") AND NOT CMAKE_GENERATOR STREQUAL "Watcom WMake")
add_test(BundleUtilities ${CMAKE_CTEST_COMMAND} add_test(BundleUtilities ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
@ -642,7 +642,6 @@ if(BUILD_TESTING)
endif() endif()
endif() endif()
endif()
set(CMAKE_BUILD_TEST_SOURCE_DIR "${CMake_SOURCE_DIR}/Tests/COnly") set(CMAKE_BUILD_TEST_SOURCE_DIR "${CMake_SOURCE_DIR}/Tests/COnly")
set(CMAKE_BUILD_TEST_BINARY_DIR "${CMake_BINARY_DIR}/Tests/CMakeBuildCOnly") set(CMAKE_BUILD_TEST_BINARY_DIR "${CMake_BINARY_DIR}/Tests/CMakeBuildCOnly")