From b9a7d15c785c72aa578ab41507fd2a401d7b27e4 Mon Sep 17 00:00:00 2001
From: Tim Kaune <tim.kaune@gmx.de>
Date: Wed, 26 Mar 2025 12:47:15 +0100
Subject: [PATCH] Consistently modify CMAKE_MODULE_PATH
This should happen for both add_subdirectory() as well as find_package()
calls. Nothing should be included either way. The consuming project
decides, what should be included.
---
CMakeLists.txt | 4 ++++
src/CMakeLists.txt | 2 ++
src/cmake/CMakeLists.txt | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4df723..0f74af0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,10 @@ option(LoadStaticSharedTargets_INCLUDE_PACKAGING "Include packaging rules for Lo
add_subdirectory(src)
+if (NOT IS_TOP_LEVEL)
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
+endif ()
+
if (IS_TOP_LEVEL AND BUILD_TESTING)
add_subdirectory(tests)
endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4cd9d9f..814c6d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,3 +26,5 @@ SOFTWARE.
add_custom_target(LoadStaticSharedTargets ALL)
add_subdirectory(cmake)
+
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
diff --git a/src/cmake/CMakeLists.txt b/src/cmake/CMakeLists.txt
index 705ece0..7d840d5 100644
--- a/src/cmake/CMakeLists.txt
+++ b/src/cmake/CMakeLists.txt
@@ -25,4 +25,5 @@ SOFTWARE.
target_sources(LoadStaticSharedTargets PRIVATE LoadStaticSharedTargets.cmake)
-include(LoadStaticSharedTargets.cmake)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
--
GitLab