From 259e508a2bdd220b332511480dd1c77bf137275f Mon Sep 17 00:00:00 2001
From: Dominik Drexler <dominik.drexler@gmx.net>
Date: Sat, 13 Jan 2024 02:08:55 +0100
Subject: [PATCH] simplified integration

---
 CMakeLists.txt                                |  2 +-
 cmake/configure_dependencies.cmake            | 32 -------------------
 tests/integration/CMakeLists.txt              | 22 +------------
 .../cmake/configure_dependencies.cmake        | 32 -------------------
 4 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 cmake/configure_dependencies.cmake
 delete mode 100644 tests/integration/cmake/configure_dependencies.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bcd95f4..0a30f80b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ list(APPEND CMAKE_MODULE_PATH
 )
 include("configure_boost")
 include("configure_ccache")
-include("configure_dependencies")
+
 
 ##############################################################
 # CCache
diff --git a/cmake/configure_dependencies.cmake b/cmake/configure_dependencies.cmake
deleted file mode 100644
index f99851e7..00000000
--- a/cmake/configure_dependencies.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Appends each name from the given list to the CMAKE_PREFIX_PATH
-# E.g. for list of names [boost, loki]
-#      CMAKE_PREFIX_PATH = [CMAKE_PREFIX_PATH/boost, CMAKE_PREFIX_PATH/loki]
-# Assumes that CMAKE_PREFIX_PATH consists of a single path.
-# We require that the user adds dependencies to the Superbuild.
-macro(configure_dependencies list_of_dependencies)
-    message("Configure dependencies of Loki:")
-    message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-    list(LENGTH CMAKE_PREFIX_PATH PREFIX_PATH_COUNT)
-    if(PREFIX_PATH_COUNT GREATER 1)
-        message(FATAL_ERROR "Only one prefix path is allowed. Found multiple paths in CMAKE_PREFIX_PATH. Please add dependencies to the CMake Superbuild.")
-    endif()
-
-    # Assuming there's only one path in CMAKE_PREFIX_PATH, get that path
-    list(GET CMAKE_PREFIX_PATH 0 SINGLE_CMAKE_PREFIX_PATH)
-
-    # Clear MODIFIED_CMAKE_PREFIX_PATH before appending
-    set(MODIFIED_CMAKE_PREFIX_PATH "")
-
-    # Iterate over list of names and append each to SINGLE_CMAKE_PREFIX_PATH
-    foreach(DEPENDENCY_NAME ${list_of_dependencies})
-        list(APPEND MODIFIED_CMAKE_PREFIX_PATH "${SINGLE_CMAKE_PREFIX_PATH}/${DEPENDENCY_NAME}")
-    endforeach()
-
-   #  message(${MODIFIED_CMAKE_PREFIX_PATH})
-    set(CMAKE_PREFIX_PATH ${MODIFIED_CMAKE_PREFIX_PATH})
-    message(STATUS "MODIFIED_CMAKE_PREFIX_PATH:")
-    foreach(CMAKE_PREFIX_PATH_ARG ${CMAKE_PREFIX_PATH})
-        message(STATUS "-- ${CMAKE_PREFIX_PATH_ARG}")
-    endforeach()
-    # set(CMAKE_FIND_DEBUG_MODE ON)
-endmacro()
\ No newline at end of file
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 03a1215e..ec4a551d 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -21,27 +21,7 @@ project(integration_example VERSION "0.0.1" LANGUAGES C CXX)
 # CMake modules and macro files
 ##############################################################
 
-list(APPEND CMAKE_MODULE_PATH
-  "${PROJECT_SOURCE_DIR}/cmake"
-)
-include("configure_dependencies")
-
-
-##############################################################
-# Dependency Handling
-##############################################################
-
-# set(CMAKE_FIND_DEBUG_MODE ON)
-
-set(DEPENDENCY_NAMES_LIST loki)
-configure_dependencies("${DEPENDENCY_NAMES_LIST}")
-
-
-##############################################################
-# CMake modules and macro files
-##############################################################
-
-find_package(loki 0.0.1 COMPONENTS parsers REQUIRED)
+find_package(loki 0.0.1 COMPONENTS parsers REQUIRED PATHS "${CMAKE_INSTALL_PREFIX}/loki" NO_SYSTEM_ENVIRONMENT_PATH)
 
 
 ##############################################################
diff --git a/tests/integration/cmake/configure_dependencies.cmake b/tests/integration/cmake/configure_dependencies.cmake
deleted file mode 100644
index f99851e7..00000000
--- a/tests/integration/cmake/configure_dependencies.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Appends each name from the given list to the CMAKE_PREFIX_PATH
-# E.g. for list of names [boost, loki]
-#      CMAKE_PREFIX_PATH = [CMAKE_PREFIX_PATH/boost, CMAKE_PREFIX_PATH/loki]
-# Assumes that CMAKE_PREFIX_PATH consists of a single path.
-# We require that the user adds dependencies to the Superbuild.
-macro(configure_dependencies list_of_dependencies)
-    message("Configure dependencies of Loki:")
-    message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-    list(LENGTH CMAKE_PREFIX_PATH PREFIX_PATH_COUNT)
-    if(PREFIX_PATH_COUNT GREATER 1)
-        message(FATAL_ERROR "Only one prefix path is allowed. Found multiple paths in CMAKE_PREFIX_PATH. Please add dependencies to the CMake Superbuild.")
-    endif()
-
-    # Assuming there's only one path in CMAKE_PREFIX_PATH, get that path
-    list(GET CMAKE_PREFIX_PATH 0 SINGLE_CMAKE_PREFIX_PATH)
-
-    # Clear MODIFIED_CMAKE_PREFIX_PATH before appending
-    set(MODIFIED_CMAKE_PREFIX_PATH "")
-
-    # Iterate over list of names and append each to SINGLE_CMAKE_PREFIX_PATH
-    foreach(DEPENDENCY_NAME ${list_of_dependencies})
-        list(APPEND MODIFIED_CMAKE_PREFIX_PATH "${SINGLE_CMAKE_PREFIX_PATH}/${DEPENDENCY_NAME}")
-    endforeach()
-
-   #  message(${MODIFIED_CMAKE_PREFIX_PATH})
-    set(CMAKE_PREFIX_PATH ${MODIFIED_CMAKE_PREFIX_PATH})
-    message(STATUS "MODIFIED_CMAKE_PREFIX_PATH:")
-    foreach(CMAKE_PREFIX_PATH_ARG ${CMAKE_PREFIX_PATH})
-        message(STATUS "-- ${CMAKE_PREFIX_PATH_ARG}")
-    endforeach()
-    # set(CMAKE_FIND_DEBUG_MODE ON)
-endmacro()
\ No newline at end of file