fix(cmake): Change include_guards from the global scope to the current scope, to enable find_package calls from different scopes to succeed (fixes #74). (#75)

davidlion · web-flow · commit c03806a35641 · 2025-09-25T18:02:31.000-04:00
diff --git a/cmake/ystdlib/libs/containers-config.cmake.in b/cmake/ystdlib/libs/containers-config.cmake.in
@@ -1,3 +1,3 @@
-include_guard(GLOBAL)
+include_guard()
 
 include("${CMAKE_CURRENT_LIST_DIR}/containers-target.cmake")
diff --git a/cmake/ystdlib/libs/error_handling-config.cmake.in b/cmake/ystdlib/libs/error_handling-config.cmake.in
@@ -1,4 +1,4 @@
-include_guard(GLOBAL)
+include_guard()
 
 find_dependency(Boost @BOOST_FIND_PACKAGE_ARGS@)
 
diff --git a/cmake/ystdlib/libs/io_interface-config.cmake.in b/cmake/ystdlib/libs/io_interface-config.cmake.in
@@ -1,4 +1,4 @@
-include_guard(GLOBAL)
+include_guard()
 
 include("${CMAKE_CURRENT_LIST_DIR}/wrapped_facade_headers-config.cmake")
 
diff --git a/cmake/ystdlib/libs/wrapped_facade_headers-config.cmake.in b/cmake/ystdlib/libs/wrapped_facade_headers-config.cmake.in
@@ -1,3 +1,3 @@
-include_guard(GLOBAL)
+include_guard()
 
 include("${CMAKE_CURRENT_LIST_DIR}/wrapped_facade_headers-target.cmake")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-include_guard(GLOBAL)`
	`1`	`+include_guard()`
`2`	`2`
`3`	`3`	`include("${CMAKE_CURRENT_LIST_DIR}/containers-target.cmake")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include_guard(GLOBAL)`
	`1`	`+include_guard()`
`2`	`2`
`3`	`3`	`find_dependency(Boost @BOOST_FIND_PACKAGE_ARGS@)`
`4`	`4`