From 91a1baae4822ce637f0059837ac49c9e66d5d6d8 Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Wed, 27 Dec 2017 14:26:36 +0000 Subject: [PATCH] Fix errors made in merging. --- Test/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt index 0972417..ccaa548 100644 --- a/Test/CMakeLists.txt +++ b/Test/CMakeLists.txt @@ -64,19 +64,19 @@ function(addtest_variants TEST TEST_SOURCE) addtest_flags("${TEST}_optimised" "-O3 -fobjc-runtime=gnustep-2.0 -UNDEBUG" "${TEST_SOURCE}") addtest_flags("${TEST}_legacy" "-O0 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}") addtest_flags("${TEST}_legacy_optimised" "-O3 -fobjc-runtime=gnustep-1.7 -UNDEBUG" "${TEST_SOURCE}") - target_compile_definitions("${TEST}_legacy" PRIVATE SINGLE_FILE_TEST=1) - target_compile_definitions("${TEST}_legacy_optimised" PRIVATE SINGLE_FILE_TEST=1) - target_compile_definitions(${TEST} PRIVATE SINGLE_FILE_TEST=1) - target_compile_definitions("${TEST}_optimised" PRIVATE SINGLE_FILE_TEST=1) endfunction(addtest_variants) foreach(TEST_SOURCE ${TESTS}) get_filename_component(TEST ${TEST_SOURCE} NAME_WE) addtest_variants(${TEST} ${TEST_SOURCE}) + target_compile_definitions("${TEST}_legacy" PRIVATE SINGLE_FILE_TEST=1) + target_compile_definitions("${TEST}_legacy_optimised" PRIVATE SINGLE_FILE_TEST=1) + target_compile_definitions(${TEST} PRIVATE SINGLE_FILE_TEST=1) + target_compile_definitions("${TEST}_optimised" PRIVATE SINGLE_FILE_TEST=1) endforeach() # Tests that are more than a single file. -addtest_variants("CXXExceptions" "CXXException.m;CXXException.cc") +addtest_variants("CXXExceptions" "CXXException.m;CXXException.cc;Test.m") if (ENABLE_OBJCXX) addtest_variants(ObjCXXEHInterop "ObjCXXEHInterop.mm;ObjCXXEHInterop.m;Test.m") endif()