Merge pull request #903 from markus-t314/bugfix/cmake_package_dependency

Added missing dependencies in Package Configuration File
redboltz · Nov 9, 2021 · 29f93bc · 29f93bc
2 parents 7ac3e0c + 8a9aa32
commit 29f93bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,22 +128,26 @@ ENDIF ()
 SET (Boost_USE_MULTITHREADED ON)
 FIND_PACKAGE (Threads REQUIRED)
 
+SET (MQTT_BOOST_COMPONENTS)
 IF (MQTT_USE_LOG)
  MESSAGE (STATUS "Logging enabled")
- FIND_PACKAGE (Boost 1.67.0 REQUIRED COMPONENTS system date_time log filesystem thread)
+ SET (MQTT_BOOST_COMPONENTS system date_time log filesystem thread program_options)
 ELSE ()
  MESSAGE (STATUS "Logging disabled")
- FIND_PACKAGE (Boost 1.67.0 REQUIRED COMPONENTS system date_time)
+ SET (MQTT_BOOST_COMPONENTS system date_time program_options)
 ENDIF ()
+FIND_PACKAGE (Boost 1.67.0 REQUIRED COMPONENTS ${MQTT_BOOST_COMPONENTS})
 
 IF (MQTT_NO_TS_EXECUTORS AND ((Boost_MAJOR_VERSION LESS 1) OR (Boost_MINOR_VERSION LESS 74)))
  MESSAGE(FATAL_ERROR "Boost version 1.74.0 or later is required for use with standard executors")
 ENDIF ()
 
 IF (MQTT_USE_TLS)
  FIND_PACKAGE (OpenSSL REQUIRED)
+ SET (MQTT_DEPENDS_OPENSSL "FIND_DEPENDENCY (OpenSSL)")
  IF (MQTT_USE_STATIC_OPENSSL)
  FIND_PACKAGE (ZLIB REQUIRED)
+ SET (MQTT_DEPENDS_ZLIB "FIND_DEPENDENCY (ZLIB)")
  ENDIF ()
 ENDIF ()
 

diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
@@ -1,6 +1,9 @@
 SET (Boost_USE_MULTITHREADED ON)
-FIND_PACKAGE (Threads REQUIRED)
-FIND_PACKAGE (Boost 1.67.0 REQUIRED COMPONENTS system date_time)
+include(CMakeFindDependencyMacro)
+FIND_DEPENDENCY (Threads)
+FIND_DEPENDENCY (Boost 1.67.0 COMPONENTS @MQTT_BOOST_COMPONENTS@)
+@MQTT_DEPENDS_OPENSSL@
+@MQTT_DEPENDS_ZLIB@
 
 IF (NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@)
  get_filename_component(CURRENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)