From 25ff3c009ad899411522916f3c45e202c2a1e474 Mon Sep 17 00:00:00 2001 From: zachcran Date: Thu, 29 May 2025 16:03:13 -0600 Subject: [PATCH 1/3] Include missing string.cmake file --- cmake/cmake_test/asserts/asserts.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/cmake_test/asserts/asserts.cmake b/cmake/cmake_test/asserts/asserts.cmake index 83b1666..0a0d689 100644 --- a/cmake/cmake_test/asserts/asserts.cmake +++ b/cmake/cmake_test/asserts/asserts.cmake @@ -31,9 +31,10 @@ include(cmake_test/asserts/defined) include(cmake_test/asserts/equal) include(cmake_test/asserts/file_contains) include(cmake_test/asserts/file_exists) -include(cmake_test/asserts/list) include(cmake_test/asserts/library_exists) +include(cmake_test/asserts/list) +include(cmake_test/asserts/prints) +include(cmake_test/asserts/string) include(cmake_test/asserts/target_exists) include(cmake_test/asserts/target_has_property) include(cmake_test/asserts/true_false) -include(cmake_test/asserts/prints) From 2fe5a80d7533f41157b69a08d6ef6faf2998933b Mon Sep 17 00:00:00 2001 From: "Ryan M. Richard" Date: Mon, 2 Jun 2025 10:37:08 -0500 Subject: [PATCH 2/3] try without policy --- tests/cmake_test/asserts/library_exists.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cmake_test/asserts/library_exists.cmake b/tests/cmake_test/asserts/library_exists.cmake index 84fcd3d..98c60a4 100644 --- a/tests/cmake_test/asserts/library_exists.cmake +++ b/tests/cmake_test/asserts/library_exists.cmake @@ -1,5 +1,4 @@ include(cmake_test/cmake_test) -cmake_policy(SET CMP0002 OLD) #Allow duplicate targets by overriding, needed for multiple tests that work with the same target ct_add_test(NAME assert_library_exists) function(${assert_library_exists}) From 619da97ddbde0ce200f397176a7b8ac5550d5e73 Mon Sep 17 00:00:00 2001 From: "Ryan M. Richard" Date: Mon, 2 Jun 2025 14:48:26 -0500 Subject: [PATCH 3/3] finer-grained target creation --- tests/cmake_test/asserts/target_exists.cmake | 20 +++++---- .../asserts/target_has_property.cmake | 41 ++++++------------- 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/tests/cmake_test/asserts/target_exists.cmake b/tests/cmake_test/asserts/target_exists.cmake index 688c63c..7dd118b 100644 --- a/tests/cmake_test/asserts/target_exists.cmake +++ b/tests/cmake_test/asserts/target_exists.cmake @@ -1,23 +1,26 @@ include(cmake_test/cmake_test) -cmake_policy(SET CMP0002 OLD) #Allow duplicate targets by overriding, needed for multiple tests that work with the same target - ct_add_test(NAME assert_target_exists) function(${assert_target_exists}) include(cmake_test/asserts/target_exists) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/a.c" "") - add_library(my_lib "${CMAKE_CURRENT_BINARY_DIR}/a.c") ct_add_section(NAME test_target_exists) function(${test_target_exists}) - add_custom_target(my_target ALL) - ct_assert_target_exists(my_target) + set(target_name "target_${test_target_exists}") + + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/a.c" "") + add_library("${target_name}" "${CMAKE_CURRENT_BINARY_DIR}/a.c") + ct_assert_target_exists("${target_name}") endfunction() ct_add_section(NAME test_target_does_not_exist EXPECTFAIL) function(${test_target_does_not_exist}) + set(target_name "target_${test_target_does_not_exists}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/a.c" "") + add_library("${target_name}" "${CMAKE_CURRENT_BINARY_DIR}/a.c") ct_assert_target_exists(non_existant_target) endfunction() + endfunction() ct_add_test(NAME assert_target_does_not_exist) @@ -26,8 +29,9 @@ function(${assert_target_does_not_exist}) ct_add_section(NAME test_target_exists EXPECTFAIL) function(${test_target_exists}) - add_custom_target(my_target ALL) - ct_assert_target_does_not_exist(my_target) + set(target_name "target_${test_target_exist}") + add_custom_target("${target_name}" ALL) + ct_assert_target_does_not_exist("${target_name}") endfunction() ct_add_section(NAME test_target_does_not_exist) diff --git a/tests/cmake_test/asserts/target_has_property.cmake b/tests/cmake_test/asserts/target_has_property.cmake index c12dff0..51ac9cd 100644 --- a/tests/cmake_test/asserts/target_has_property.cmake +++ b/tests/cmake_test/asserts/target_has_property.cmake @@ -1,5 +1,4 @@ include(cmake_test/cmake_test) -cmake_policy(SET CMP0002 OLD) #Allow duplicate targets by overriding, needed for multiple tests that work with the same target ct_add_test(NAME assert_target_has_property) function(${assert_target_has_property}) @@ -7,23 +6,13 @@ function(${assert_target_has_property}) ct_add_section(NAME test_target_exists) function(${test_target_exists}) + set(target_name "target_${assert_target_has_property}") # Create target and add property - add_custom_target(my_target ALL) - ct_assert_target_exists(my_target) - set_target_properties( - my_target - PROPERTIES property_1 value_1 - ) - - ct_add_section(NAME test_target_has_property) - function(${test_target_has_property}) - ct_assert_target_has_property(my_target property_1) - endfunction() + add_custom_target("${target_name}" ALL) + ct_assert_target_exists("${target_name}") + set_target_properties("${target_name}" PROPERTIES property_1 value_1) - ct_add_section(NAME test_target_does_not_have_property EXPECTFAIL) - function(${test_target_does_not_have_property}) - ct_assert_target_has_property(my_target non_existant_property) - endfunction() + ct_assert_target_has_property("${target_name}" property_1) endfunction() ct_add_section(NAME test_target_does_not_exist EXPECTFAIL) @@ -38,23 +27,19 @@ function(${assert_target_does_not_have_property}) ct_add_section(NAME test_target_exists) function(${test_target_exists}) + set(target_name "target_${test_target_exists}") + # Create target and add property - add_custom_target(my_target ALL) - ct_assert_target_exists(my_target) + add_custom_target("${target_name}" ALL) + ct_assert_target_exists("${target_name}") set_target_properties( - my_target + "${target_name}" PROPERTIES property_1 value_1 ) - ct_add_section(NAME test_target_has_property EXPECTFAIL) - function(${test_target_has_property}) - ct_assert_target_does_not_have_property(my_target property_1) - endfunction() - - ct_add_section(NAME test_target_does_not_have_property) - function(${test_target_does_not_have_property}) - ct_assert_target_does_not_have_property(my_target non_existant_property) - endfunction() + ct_assert_target_does_not_have_property( + "${target_name}" non_existant_property + ) endfunction() ct_add_section(NAME test_target_does_not_exist EXPECTFAIL)