diff --git a/src/cmake/LoadStaticSharedTargets.cmake b/src/cmake/LoadStaticSharedTargets.cmake
index 1259c459a1f1fb0e4317c77de0193fdc7b650b43..3b9effb1db9805cd0644432a16c13480a60f5486 100644
--- a/src/cmake/LoadStaticSharedTargets.cmake
+++ b/src/cmake/LoadStaticSharedTargets.cmake
@@ -50,115 +50,119 @@ load_static_shared_targets(
]]
macro(load_static_shared_targets)
- set(${CMAKE_FIND_PACKAGE_NAME}_KNOWN_COMPS static shared)
- set(${CMAKE_FIND_PACKAGE_NAME}_COMP_static NO)
- set(${CMAKE_FIND_PACKAGE_NAME}_COMP_shared NO)
-
- # Iterate the list of requested components given to `find_package()`
- foreach (${CMAKE_FIND_PACKAGE_NAME}_COMP IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
- # If it's a valid component, turn on the respective switch.
- if (${CMAKE_FIND_PACKAGE_NAME}_COMP IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_KNOWN_COMPS)
- set(${CMAKE_FIND_PACKAGE_NAME}_COMP_${${CMAKE_FIND_PACKAGE_NAME}_COMP} YES)
- # Else do error handling.
- else ()
+ block (
+ SCOPE_FOR VARIABLES
+ PROPAGATE
+ ${CMAKE_FIND_PACKAGE_NAME}_FOUND
+ ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+ )
+ set(${CMAKE_FIND_PACKAGE_NAME}_KNOWN_COMPS static shared)
+ set(${CMAKE_FIND_PACKAGE_NAME}_COMP_static NO)
+ set(${CMAKE_FIND_PACKAGE_NAME}_COMP_shared NO)
+
+ # Iterate the list of requested components given to `find_package()`
+ foreach (${CMAKE_FIND_PACKAGE_NAME}_COMP IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
+ # If it's a valid component, turn on the respective switch.
+ if (${CMAKE_FIND_PACKAGE_NAME}_COMP IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_KNOWN_COMPS)
+ set(${CMAKE_FIND_PACKAGE_NAME}_COMP_${${CMAKE_FIND_PACKAGE_NAME}_COMP} YES)
+ # Else do error handling.
+ else ()
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+ "${CMAKE_FIND_PACKAGE_NAME} does not recognize component `${${CMAKE_FIND_PACKAGE_NAME}_COMP}`.")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+ return()
+ endif ()
+ endforeach ()
+
+ # Components static and shared are mutually exclusive.
+ if (${CMAKE_FIND_PACKAGE_NAME}_COMP_static AND ${CMAKE_FIND_PACKAGE_NAME}_COMP_shared)
set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
- "${CMAKE_FIND_PACKAGE_NAME} does not recognize component `${${CMAKE_FIND_PACKAGE_NAME}_COMP}`.")
+ "${CMAKE_FIND_PACKAGE_NAME} `static` and `shared` components are mutually exclusive.")
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
return()
endif ()
- endforeach ()
-
- # Components static and shared are mutually exclusive.
- if (${CMAKE_FIND_PACKAGE_NAME}_COMP_static AND ${CMAKE_FIND_PACKAGE_NAME}_COMP_shared)
- set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
- "${CMAKE_FIND_PACKAGE_NAME} `static` and `shared` components are mutually exclusive.")
- set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
- return()
- endif ()
-
- # Parse static and shared targets from argument list.
- set(${CMAKE_FIND_PACKAGE_NAME}_ARGUMENT_KEYWORDS STATIC_TARGETS SHARED_TARGETS)
- cmake_parse_arguments(${CMAKE_FIND_PACKAGE_NAME} "" "" "${${CMAKE_FIND_PACKAGE_NAME}_ARGUMENT_KEYWORDS}" ${ARGN})
- # We now have ${CMAKE_FIND_PACKAGE_NAME}_STATIC_TARGETS and
- # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_TARGETS variables created for us.
-
- # Static component requested
- if (${CMAKE_FIND_PACKAGE_NAME}_COMP_static)
- _load_static_shared_targets_load_targets(STATIC)
- # Shared component requested
- elseif (${CMAKE_FIND_PACKAGE_NAME}_COMP_shared)
- _load_static_shared_targets_load_targets(SHARED)
- # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS cache variable set to ON
- elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS AND ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS)
- _load_static_shared_targets_load_targets(SHARED)
- # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS cache variable set to OFF
- elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS AND NOT ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS)
- _load_static_shared_targets_load_targets(STATIC)
- # BUILD_SHARED_LIBS variable set to ON
- elseif (BUILD_SHARED_LIBS)
- # If shared targets are installed, include them.
- # Otherwise at least load the static targets
- _load_static_shared_targets_load_targets(SHARED ALTERNATIVE STATIC)
- # BUILD_SHARED_LIBS variable set to OFF
- else ()
- # If static targets are installed, include them.
- # Otherwise at least load the shared targets
- _load_static_shared_targets_load_targets(STATIC ALTERNATIVE SHARED)
- endif ()
-
- unset(${CMAKE_FIND_PACKAGE_NAME}_KNOWN_COMPS)
- unset(${CMAKE_FIND_PACKAGE_NAME}_COMP_static)
- unset(${CMAKE_FIND_PACKAGE_NAME}_COMP_shared)
- unset(${CMAKE_FIND_PACKAGE_NAME}_ARGUMENT_KEYWORDS)
- unset(${CMAKE_FIND_PACKAGE_NAME}_STATIC_TARGETS)
- unset(${CMAKE_FIND_PACKAGE_NAME}_SHARED_TARGETS)
+
+ # Parse static and shared targets from argument list.
+ set(${CMAKE_FIND_PACKAGE_NAME}_ARGUMENT_KEYWORDS STATIC_TARGETS SHARED_TARGETS)
+ cmake_parse_arguments(${CMAKE_FIND_PACKAGE_NAME} "" "" "${${CMAKE_FIND_PACKAGE_NAME}_ARGUMENT_KEYWORDS}" ${ARGN})
+ # We now have ${CMAKE_FIND_PACKAGE_NAME}_STATIC_TARGETS and
+ # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_TARGETS variables created for us.
+
+ # Static component requested
+ if (${CMAKE_FIND_PACKAGE_NAME}_COMP_static)
+ _load_static_shared_targets_load_targets(STATIC)
+ # Shared component requested
+ elseif (${CMAKE_FIND_PACKAGE_NAME}_COMP_shared)
+ _load_static_shared_targets_load_targets(SHARED)
+ # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS cache variable set to ON
+ elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS AND ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS)
+ _load_static_shared_targets_load_targets(SHARED)
+ # ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS cache variable set to OFF
+ elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS AND NOT ${CMAKE_FIND_PACKAGE_NAME}_SHARED_LIBS)
+ _load_static_shared_targets_load_targets(STATIC)
+ # BUILD_SHARED_LIBS variable set to ON
+ elseif (BUILD_SHARED_LIBS)
+ # If shared targets are installed, include them.
+ # Otherwise at least load the static targets
+ _load_static_shared_targets_load_targets(SHARED ALTERNATIVE STATIC)
+ # BUILD_SHARED_LIBS variable set to OFF
+ else ()
+ # If static targets are installed, include them.
+ # Otherwise at least load the shared targets
+ _load_static_shared_targets_load_targets(STATIC ALTERNATIVE SHARED)
+ endif ()
+ endblock ()
endmacro()
# Macro to check, if the target files for the requested type are all installed.
# If so, include them. Otherwise, try alternative type, if given. Do error
# handling, if not.
macro(_load_static_shared_targets_load_targets TYPE)
- cmake_parse_arguments(${CMAKE_FIND_PACKAGE_NAME} "" "ALTERNATIVE" "" ${ARGN})
- # We now have ${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE variable created for us.
-
- set(${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND TRUE)
-
- foreach (
- ${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET
- IN LISTS
- ${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGETS
+ block (
+ SCOPE_FOR VARIABLES
+ PROPAGATE
+ ${CMAKE_FIND_PACKAGE_NAME}_FOUND
+ ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
)
- # Check, if any of the targets for the requested TYPE does not exist
- if (NOT EXISTS "${${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET}")
- set(${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND FALSE)
- break ()
- endif ()
- endforeach ()
+ cmake_parse_arguments(${CMAKE_FIND_PACKAGE_NAME} "" "ALTERNATIVE" "" ${ARGN})
+ # We now have the ${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE variable created for us.
+
+ set(${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND TRUE)
- # If TYPE targets are all installed, include them.
- if (${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND)
foreach (
${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET
IN LISTS
${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGETS
)
- # We know they all exist.
- include("${${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET}")
+ # Check, if any of the targets for the requested TYPE does not exist
+ if (NOT EXISTS "${${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET}")
+ set(${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND FALSE)
+ break ()
+ endif ()
endforeach ()
- # Otherwise at least load the ALTERNATIVE targets, if given
- elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE)
- message(WARNING
- "Requested `${TYPE}` targets for package ${CMAKE_FIND_PACKAGE_NAME} were not found. "
- "Trying alternative `${${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE}` targets."
- )
- _load_static_shared_targets_load_targets(${${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE})
- else ()
- set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
- "${CMAKE_FIND_PACKAGE_NAME} `${TYPE}` libraries were requested but not found.")
- set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
- return()
- endif ()
-
- unset(${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND)
- unset(${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE)
+
+ # If TYPE targets are all installed, include them.
+ if (${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_FOUND)
+ foreach (
+ ${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET
+ IN LISTS
+ ${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGETS
+ )
+ # We know they all exist.
+ include("${${CMAKE_FIND_PACKAGE_NAME}_${TYPE}_TARGET}")
+ endforeach ()
+ # Otherwise at least load the ALTERNATIVE targets, if given
+ elseif (DEFINED ${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE)
+ message(WARNING
+ "Requested `${TYPE}` targets for package ${CMAKE_FIND_PACKAGE_NAME} were not found. "
+ "Trying alternative `${${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE}` targets."
+ )
+ _load_static_shared_targets_load_targets(${${CMAKE_FIND_PACKAGE_NAME}_ALTERNATIVE})
+ else ()
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+ "${CMAKE_FIND_PACKAGE_NAME} `${TYPE}` libraries were requested but not found.")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+ return()
+ endif ()
+ endblock ()
endmacro()
diff --git a/tests/common-failures_test-case-01.cmake b/tests/common-failures_test-case-01.cmake
index 57e5f6452195978eab53ae6d13bba7997d622381..e2a599fa6a95328f371c8e1550094733d37fd6b8 100644
--- a/tests/common-failures_test-case-01.cmake
+++ b/tests/common-failures_test-case-01.cmake
@@ -46,5 +46,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} does not recognize component `unknown`."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/common-failures_test-case-02.cmake b/tests/common-failures_test-case-02.cmake
index b94ba343a96529f075567600335dcf3455b1e021..fe04ea607423aaaa0647891617771128f280e66c 100644
--- a/tests/common-failures_test-case-02.cmake
+++ b/tests/common-failures_test-case-02.cmake
@@ -46,5 +46,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `static` and `shared` components are mutually exclusive."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/helpers/assertions.cmake b/tests/helpers/assertions.cmake
index 42fdb29dd7e41252ddce40b0b9482de8b8be6128..593123cffb8e393a65c99cd1821f24f269688d93 100644
--- a/tests/helpers/assertions.cmake
+++ b/tests/helpers/assertions.cmake
@@ -99,6 +99,42 @@ macro(CHECK_DEFINED VAR_NAME)
endif ()
endmacro()
+macro(SET_TARGET_MOCK TARGET_NAME)
+ set(ENV{${TARGET_NAME}} TRUE)
+endmacro()
+
+macro(REQUIRE_TARGET_UNDEFINED TARGET_NAME)
+ if (DEFINED ENV{${TARGET_NAME}})
+ message(FATAL_ERROR "${TARGET_NAME} is DEFINED!")
+ else ()
+ message(STATUS "${TARGET_NAME} is NOT DEFINED.")
+ endif ()
+endmacro()
+
+macro(CHECK_TARGET_UNDEFINED TARGET_NAME)
+ if (DEFINED ENV{${TARGET_NAME}})
+ message(SEND_ERROR "${TARGET_NAME} is DEFINED!")
+ else ()
+ message(STATUS "${TARGET_NAME} is NOT DEFINED.")
+ endif ()
+endmacro()
+
+macro(REQUIRE_TARGET_DEFINED TARGET_NAME)
+ if (NOT DEFINED ENV{${TARGET_NAME}})
+ message(FATAL_ERROR "${TARGET_NAME} is NOT DEFINED!")
+ else ()
+ message(STATUS "${TARGET_NAME} is DEFINED.")
+ endif ()
+endmacro()
+
+macro(CHECK_TARGET_DEFINED TARGET_NAME)
+ if (NOT DEFINED ENV{${TARGET_NAME}})
+ message(SEND_ERROR "${TARGET_NAME} is NOT DEFINED!")
+ else ()
+ message(STATUS "${TARGET_NAME} is DEFINED.")
+ endif ()
+endmacro()
+
macro(REQUIRE_STREQUAL VAR_NAME VALUE)
if (NOT ${VAR_NAME} STREQUAL "${VALUE}")
message(FATAL_ERROR "${VAR_NAME} with value `${${VAR_NAME}}` is NOT STREQUAL to `${VALUE}`!")
diff --git a/tests/include-requested-by-common-flag_test-case-01.cmake b/tests/include-requested-by-common-flag_test-case-01.cmake
index 4041d69a3cd8cd5a8eb387fcb865139cfcbd744b..45b072f2bde4aa9dd773481316e4e62042fbe076 100644
--- a/tests/include-requested-by-common-flag_test-case-01.cmake
+++ b/tests/include-requested-by-common-flag_test-case-01.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-common-flag_test-case-02.cmake b/tests/include-requested-by-common-flag_test-case-02.cmake
index fc2921051ec321cf39d26d6b40e29f74672704b2..a764fc0a0f0a9deb4c1a7f0608e8902c596347bf 100644
--- a/tests/include-requested-by-common-flag_test-case-02.cmake
+++ b/tests/include-requested-by-common-flag_test-case-02.cmake
@@ -38,4 +38,4 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-common-flag_test-case-04.cmake b/tests/include-requested-by-common-flag_test-case-04.cmake
index e6d5de0ef2b8b007dbaf9982f38f51f506913f9c..b741b23473b457e51385215bb858334716a3133e 100644
--- a/tests/include-requested-by-common-flag_test-case-04.cmake
+++ b/tests/include-requested-by-common-flag_test-case-04.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-common-flag_test-case-05.cmake b/tests/include-requested-by-common-flag_test-case-05.cmake
index 51bb9c221edae1c0048dd406fb40dc60aecd21a6..26699bec3dfbf63def87d15726dffacfc8daff7c 100644
--- a/tests/include-requested-by-common-flag_test-case-05.cmake
+++ b/tests/include-requested-by-common-flag_test-case-05.cmake
@@ -40,5 +40,6 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-common-flag_test-case-06.cmake b/tests/include-requested-by-common-flag_test-case-06.cmake
index 9b9517b8bed29a9b2b90f256456f569a94e70f20..76d33557c74b79c21ce281c2faf7fdf47909f6fa 100644
--- a/tests/include-requested-by-common-flag_test-case-06.cmake
+++ b/tests/include-requested-by-common-flag_test-case-06.cmake
@@ -45,3 +45,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `STATIC` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-common-flag_test-case-07.cmake b/tests/include-requested-by-common-flag_test-case-07.cmake
index fe237c352ae60b73bd30ff8c609b031c58858cf1..8a3f19f8df73e4826b047f3fdec547efe186189b 100644
--- a/tests/include-requested-by-common-flag_test-case-07.cmake
+++ b/tests/include-requested-by-common-flag_test-case-07.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-common-flag_test-case-08.cmake b/tests/include-requested-by-common-flag_test-case-08.cmake
index 480db26291819f155a37491b9afff8f464eaba96..f5a8e5577ec29d4cbc9de4929eac95756cbced85 100644
--- a/tests/include-requested-by-common-flag_test-case-08.cmake
+++ b/tests/include-requested-by-common-flag_test-case-08.cmake
@@ -38,4 +38,4 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-common-flag_test-case-10.cmake b/tests/include-requested-by-common-flag_test-case-10.cmake
index 3f86dc63bde95830b67530dd800ce6bed2d09821..64969633f82d464b26b1d150b595c0d6612c7f2d 100644
--- a/tests/include-requested-by-common-flag_test-case-10.cmake
+++ b/tests/include-requested-by-common-flag_test-case-10.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-common-flag_test-case-11.cmake b/tests/include-requested-by-common-flag_test-case-11.cmake
index f9a80827e6d31d2668297b1575ddfbed2288bfa4..d1b4332994f8f9100602adbce149896e2f43c505 100644
--- a/tests/include-requested-by-common-flag_test-case-11.cmake
+++ b/tests/include-requested-by-common-flag_test-case-11.cmake
@@ -40,5 +40,6 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-common-flag_test-case-12.cmake b/tests/include-requested-by-common-flag_test-case-12.cmake
index 219e93dda44e3ead85534ea4abbbd59d34a217cb..a6d98c71144622292af54ec7073f7b6043dfa659 100644
--- a/tests/include-requested-by-common-flag_test-case-12.cmake
+++ b/tests/include-requested-by-common-flag_test-case-12.cmake
@@ -45,3 +45,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `SHARED` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-component_test-case-01.cmake b/tests/include-requested-by-component_test-case-01.cmake
index 9116f45ea7a00b97d7b5ccf556b91960125f699f..027ef99df6807ba70996135f7cd6800489b30bb3 100644
--- a/tests/include-requested-by-component_test-case-01.cmake
+++ b/tests/include-requested-by-component_test-case-01.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-component_test-case-02.cmake b/tests/include-requested-by-component_test-case-02.cmake
index 2ca2f9ff9586797b26a3b096c61843c80bb6cc8d..314e7e6152486b85aeeb7f93124f210b9e0cd5d9 100644
--- a/tests/include-requested-by-component_test-case-02.cmake
+++ b/tests/include-requested-by-component_test-case-02.cmake
@@ -43,4 +43,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `SHARED` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-component_test-case-03.cmake b/tests/include-requested-by-component_test-case-03.cmake
index 98a460a4ad664f7059933da33dea74dc99d92f9e..4f49622f0dab759329b385134de303ece4f583f5 100644
--- a/tests/include-requested-by-component_test-case-03.cmake
+++ b/tests/include-requested-by-component_test-case-03.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-component_test-case-04.cmake b/tests/include-requested-by-component_test-case-04.cmake
index 8f53a6e63f84fb7b86f523b7ba63c471b6b8fbbe..2ec94ff9d0050ecc27b14f934acd80140e735998 100644
--- a/tests/include-requested-by-component_test-case-04.cmake
+++ b/tests/include-requested-by-component_test-case-04.cmake
@@ -45,5 +45,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `SHARED` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/include-requested-by-component_test-case-05.cmake b/tests/include-requested-by-component_test-case-05.cmake
index 366209b5152f94af84f91687910a2e1334ce6b9a..4c83ca2f7603e06a082623c6b45ec8f44731044d 100644
--- a/tests/include-requested-by-component_test-case-05.cmake
+++ b/tests/include-requested-by-component_test-case-05.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-component_test-case-06.cmake b/tests/include-requested-by-component_test-case-06.cmake
index 3ca2796582730d247fea3ffe0ade3b3a077cb159..961c96ba2612eb244f58e8a0bd76ca9cf8b6e0e8 100644
--- a/tests/include-requested-by-component_test-case-06.cmake
+++ b/tests/include-requested-by-component_test-case-06.cmake
@@ -43,4 +43,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `STATIC` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-component_test-case-07.cmake b/tests/include-requested-by-component_test-case-07.cmake
index edf29dd1cc43cb81794e17f78d031e3facff6d42..ef010408f1cf5e261c75c25c2bacf88737c4c182 100644
--- a/tests/include-requested-by-component_test-case-07.cmake
+++ b/tests/include-requested-by-component_test-case-07.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-component_test-case-08.cmake b/tests/include-requested-by-component_test-case-08.cmake
index e8e2c085965ec527138e86e5d58016b8a812cd0e..7ac60b1bce5b5024c4e4d6780edef759a7f4f619 100644
--- a/tests/include-requested-by-component_test-case-08.cmake
+++ b/tests/include-requested-by-component_test-case-08.cmake
@@ -45,5 +45,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `STATIC` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/include-requested-by-package-flag_test-case-01.cmake b/tests/include-requested-by-package-flag_test-case-01.cmake
index ab6a593cfec78cbd66511419a983efe3c3b4bc91..b2972129cd4bd993702a5bf80348cbbeed3d92a4 100644
--- a/tests/include-requested-by-package-flag_test-case-01.cmake
+++ b/tests/include-requested-by-package-flag_test-case-01.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-package-flag_test-case-02.cmake b/tests/include-requested-by-package-flag_test-case-02.cmake
index 3a88c4756d049941bf2962f79fb933ad5f01d2da..a1a125f2f0a4f315899c62f9131b3f182ac252c0 100644
--- a/tests/include-requested-by-package-flag_test-case-02.cmake
+++ b/tests/include-requested-by-package-flag_test-case-02.cmake
@@ -43,4 +43,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `SHARED` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-package-flag_test-case-03.cmake b/tests/include-requested-by-package-flag_test-case-03.cmake
index 9a5f21e5fc55510b59b545dcef36cffef398e33d..a2393c3ef406165cf29fed0a9311e3588b89c922 100644
--- a/tests/include-requested-by-package-flag_test-case-03.cmake
+++ b/tests/include-requested-by-package-flag_test-case-03.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-package-flag_test-case-04.cmake b/tests/include-requested-by-package-flag_test-case-04.cmake
index bcdf0aea1b3eb3721edeec57bb0c5d1ec98e7a2a..ac29bb9da7634f78adb90a1393221daca6c48fec 100644
--- a/tests/include-requested-by-package-flag_test-case-04.cmake
+++ b/tests/include-requested-by-package-flag_test-case-04.cmake
@@ -45,5 +45,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `SHARED` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/include-requested-by-package-flag_test-case-05.cmake b/tests/include-requested-by-package-flag_test-case-05.cmake
index a090d9287983c95dc9a75051298f9bd738629c38..a659a726497430b40f9b4b7e6fe3b92cba19cf97 100644
--- a/tests/include-requested-by-package-flag_test-case-05.cmake
+++ b/tests/include-requested-by-package-flag_test-case-05.cmake
@@ -38,4 +38,5 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
diff --git a/tests/include-requested-by-package-flag_test-case-06.cmake b/tests/include-requested-by-package-flag_test-case-06.cmake
index 4f6edcb00a5db7e19b9643550ff2e4dce93a8415..fec8ea6c0d3f9a0cb55cd5d0c3096b0fda5018f3 100644
--- a/tests/include-requested-by-package-flag_test-case-06.cmake
+++ b/tests/include-requested-by-package-flag_test-case-06.cmake
@@ -43,4 +43,4 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `STATIC` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
diff --git a/tests/include-requested-by-package-flag_test-case-07.cmake b/tests/include-requested-by-package-flag_test-case-07.cmake
index 299fcf6bf511f0dce2883c8ffc5a2caac2d50cf5..66f713aec1363bb6427fa84ccad7ac19c85fdb71 100644
--- a/tests/include-requested-by-package-flag_test-case-07.cmake
+++ b/tests/include-requested-by-package-flag_test-case-07.cmake
@@ -40,5 +40,7 @@ set(
include("./helpers/testee_macro_wrapper.cmake")
-REQUIRE_TRUTHY(TEST_TARGET_1)
-REQUIRE_TRUTHY(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_1)
+REQUIRE_TARGET_DEFINED(SUCCESS_TARGET_2)
diff --git a/tests/include-requested-by-package-flag_test-case-08.cmake b/tests/include-requested-by-package-flag_test-case-08.cmake
index 58cd88601e6bb6d31a44d5872cc95a9f26790cfb..0615f36118f5908ed5c88880a4155dd8cc1aca26 100644
--- a/tests/include-requested-by-package-flag_test-case-08.cmake
+++ b/tests/include-requested-by-package-flag_test-case-08.cmake
@@ -45,5 +45,5 @@ CHECK_STREQUAL(
"${CMAKE_FIND_PACKAGE_NAME} `STATIC` libraries were requested but not found."
)
REQUIRE_FALSY(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-REQUIRE_UNDEFINED(TEST_TARGET_1)
-REQUIRE_UNDEFINED(TEST_TARGET_2)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_1)
+REQUIRE_TARGET_UNDEFINED(FAILURE_TARGET_2)
diff --git a/tests/mocks/failure-target1.cmake b/tests/mocks/failure-target1.cmake
index 28063d699d10a15ea193a8fb84ca31c67d1415bd..7336aa26063d1d8341fce568689b2320d681ff86 100644
--- a/tests/mocks/failure-target1.cmake
+++ b/tests/mocks/failure-target1.cmake
@@ -1,2 +1,2 @@
message(STATUS "Wrong target included.")
-set(TEST_TARGET_1 FALSE)
+SET_TARGET_MOCK(FAILURE_TARGET_1)
diff --git a/tests/mocks/failure-target2.cmake b/tests/mocks/failure-target2.cmake
index e8c271e2668a7652b3980248b7679c4124b86576..c685de7c9454d98d416483c1c3314dfa1d09e88a 100644
--- a/tests/mocks/failure-target2.cmake
+++ b/tests/mocks/failure-target2.cmake
@@ -1,2 +1,2 @@
message(STATUS "Wrong target included.")
-set(TEST_TARGET_2 FALSE)
+SET_TARGET_MOCK(FAILURE_TARGET_2)
diff --git a/tests/mocks/success-target1.cmake b/tests/mocks/success-target1.cmake
index 8de8ffb0cdefd7adb96286f090dfb835d41fc597..cbad17ca77b179ffa1849cdb3a2324764602c3dc 100644
--- a/tests/mocks/success-target1.cmake
+++ b/tests/mocks/success-target1.cmake
@@ -1,2 +1,2 @@
message(STATUS "Correct target successfully included.")
-set(TEST_TARGET_1 TRUE)
+SET_TARGET_MOCK(SUCCESS_TARGET_1)
diff --git a/tests/mocks/success-target2.cmake b/tests/mocks/success-target2.cmake
index dbbe2423a4b51004a75f90a43bec4efa6894ed4a..36847f96a1c3565bd667edf0c0c23ab67640658a 100644
--- a/tests/mocks/success-target2.cmake
+++ b/tests/mocks/success-target2.cmake
@@ -1,2 +1,2 @@
message(STATUS "Correct target successfully included.")
-set(TEST_TARGET_2 TRUE)
+SET_TARGET_MOCK(SUCCESS_TARGET_2)