Fix cmake path handling for installed dependdencies when using cpptrace_DIR, fixes #291

Author: jeremy-rifkin

cmake/InstallRules.cmake

@@ -39,10 +39,10 @@ install(
 )
 
 # create config file that points to targets file
-configure_file(
+configure_package_config_file(
   "${PROJECT_SOURCE_DIR}/cmake/in/cpptrace-config-cmake.in"
   "${PROJECT_BINARY_DIR}/cmake/${package_name}-config.cmake"
-  @ONLY
+  INSTALL_DESTINATION "${CPPTRACE_INSTALL_CMAKEDIR}"
 )
 
 # copy config file for find_package to find

cmake/in/cpptrace-config-cmake.in

@@ -3,7 +3,13 @@
 
 # Dependencies
 include(CMakeFindDependencyMacro)
-set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
+
+# Add install prefix to search path so co-installed dependencies are found
+# even when consumers use cpptrace_DIR instead of CMAKE_PREFIX_PATH
+set(_cpptrace_CMAKE_PREFIX_PATH_OLD "${CMAKE_PREFIX_PATH}")
+list(APPEND CMAKE_PREFIX_PATH "${PACKAGE_PREFIX_DIR}")
+
+set(_cpptrace_CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
 if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@)
@@ -21,8 +27,10 @@ if(@CPPTRACE_UNWIND_WITH_LIBUNWIND@)
   find_dependency(Libunwind)
 endif()
 
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}")
-unset(CMAKE_MODULE_PATH_OLD)
+set(CMAKE_MODULE_PATH "${_cpptrace_CMAKE_MODULE_PATH_OLD}")
+unset(_cpptrace_CMAKE_MODULE_PATH_OLD)
+set(CMAKE_PREFIX_PATH "${_cpptrace_CMAKE_PREFIX_PATH_OLD}")
+unset(_cpptrace_CMAKE_PREFIX_PATH_OLD)
 
 # We cannot modify an existing IMPORT target
 if(NOT TARGET cpptrace::cpptrace)