cmake: properly handle dependencies in package config

Tectu · Jun 30, 2022 · 94d059b · 94d059b
1 parent 4fbe22d
commit 94d059b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,9 @@ if (MALLOY_FEATURE_APPFW)
     set(MALLOY_DEPENDENCY_INJA ON)
 endif()
 
+# Dependency minimum versions
+set(MALLOY_DEPENDENCY_BOOST_VERSION_MIN 1.74.0)
+
 # Add the main library
 add_subdirectory(lib)
 

diff --git a/lib/malloy/CMakeLists.txt b/lib/malloy/CMakeLists.txt
@@ -25,9 +25,10 @@ write_basic_package_version_file(
     VERSION ${PACKAGE_VERSION}
     COMPATIBILITY AnyNewerVersion
 )
+configure_file(malloy-config.cmake.in malloy-config.cmake @ONLY)
 install(
     FILES
-        malloy-config.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/malloy-config.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/malloy-config-version.cmake
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/malloy
 )

diff --git a/lib/malloy/core/external.cmake b/lib/malloy/core/external.cmake
@@ -9,7 +9,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MALLOY_BINARY_DIR})
 ########################################################################################################################
 find_package(
     Boost
-    1.74.0
+    ${MALLOY_DEPENDENCY_BOOST_VERSION_MIN}
     REQUIRED
 )
 

diff --git a/lib/malloy/malloy-config.cmake b/lib/malloy/malloy-config.cmake
diff --git a/lib/malloy/malloy-config.cmake.in b/lib/malloy/malloy-config.cmake.in
@@ -0,0 +1,15 @@
+include(CMakeFindDependencyMacro)
+
+# Capture dependency configurations
+set(MALLOY_DEPENDENCY_OPENSSL @MALLOY_DEPENDENCY_OPENSSL@)
+
+# Include dependencies
+find_dependency(Boost @MALLOY_DEPENDENCY_BOOST_VERSION_MIN@ REQUIRED)
+find_dependency(fmt REQUIRED)
+find_dependency(spdlog REQUIRED)
+if (MALLOY_DEPENDENCY_OPENSSL)
+    find_dependency(OpenSSL REQUIRED)
+endif()
+
+# Add the targets file
+include("${CMAKE_CURRENT_LIST_DIR}/malloy-targets.cmake")