Tweak cmake logic with rabbit's help.

Author: davidlion

cmake/libs/containers-config.cmake.in

@@ -1,3 +1,5 @@
-if(NOT TARGET ystdlib::containers)
-    include("${CMAKE_CURRENT_LIST_DIR}/containers-target.cmake")
+if(TARGET ystdlib::containers)
+    return()
 endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/containers-target.cmake")

cmake/libs/error_handling-config.cmake.in

@@ -1,7 +1,6 @@
-if(@Boost_FOUND@)
-    find_dependency(Boost @boost_find_package_args@)
+if(TARGET ystdlib::error_handling)
+    return()
 endif()
 
-if(NOT TARGET ystdlib::error_handling)
-    include("${CMAKE_CURRENT_LIST_DIR}/error_handling-target.cmake")
-endif()
+find_dependency(Boost @boost_find_package_args@)
+include("${CMAKE_CURRENT_LIST_DIR}/error_handling-target.cmake")

cmake/libs/io_interface-config.cmake.in

@@ -1,7 +1,9 @@
+if(TARGET ystdlib::io_interface)
+    return()
+endif()
+
 if(NOT TARGET ystdlib::wrapped_facade_headers)
     include("${CMAKE_CURRENT_LIST_DIR}/wrapped_facade_headers-target.cmake")
 endif()
 
-if(NOT TARGET ystdlib::io_interface)
-    include("${CMAKE_CURRENT_LIST_DIR}/io_interface-target.cmake")
-endif()
+include("${CMAKE_CURRENT_LIST_DIR}/io_interface-target.cmake")

cmake/libs/wrapped_facade_headers-config.cmake.in

@@ -1,3 +1,5 @@
-if(NOT TARGET ystdlib::wrapped_facade_headers)
-    include("${CMAKE_CURRENT_LIST_DIR}/wrapped_facade_headers-target.cmake")
+if(TARGET ystdlib::wrapped_facade_headers)
+    return()
 endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/wrapped_facade_headers-target.cmake")

cmake/ystdlib-helpers.cmake

@@ -9,7 +9,7 @@ macro(require_argument_values REQUIRED_ARG_NAMES)
     set(_REQUIRED_ARGS "${REQUIRED_ARG_NAMES}")
     foreach(_REQUIRED_ARG IN LISTS _REQUIRED_ARGS)
         if(NOT DEFINED ARG_${_REQUIRED_ARG} OR ARG_${_REQUIRED_ARG} STREQUAL "")
-            message(FATAL_ERROR "Non-empty value for argument: '${VAR_NAME}'")
+            message(FATAL_ERROR "Non-empty value for argument: '${_REQUIRED_ARG}'")
         endif()
     endforeach()
 endmacro()

src/ystdlib/io_interface/CMakeLists.txt

@@ -2,7 +2,7 @@ if(TARGET ystdlib::io_interface)
     return()
 endif()
 
-if(NOT wrapped_facade_headers IN_LIST ystdlib_LIBRARIES)
+if(NOT "wrapped_facade_headers" IN_LIST ystdlib_LIBRARIES)
     add_subdirectory(
         "${CMAKE_CURRENT_LIST_DIR}/../wrapped_facade_headers"
         "${CMAKE_CURRENT_BINARY_DIR}/implicit_dep/wrapped_facade_headers"