Merge pull request #51 from rleigh-codelibre/exported-config-fixes

cmake: Conditionally add log and log_setup to exported configuration
ome · Oct 10, 2017 · 7c133c4 · 7c133c4
2 parents 782c41b + 88fd6d1
commit 7c133c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/ome/common/CMakeLists.txt b/lib/ome/common/CMakeLists.txt
@@ -132,6 +132,7 @@ if(OME_HAVE_BOOST_LOG)
   set(log_libraries
       Boost::log_setup
       Boost::log)
+  set(OME_COMMON_OPTIONAL_BOOST_COMPONENTS "log_setup log")
 endif()
 
 target_link_libraries(ome-common

diff --git a/lib/ome/common/OMECommonConfig.cmake.in b/lib/ome/common/OMECommonConfig.cmake.in
@@ -1,12 +1,12 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(OMECompat REQUIRED)
-find_dependency(Boost 1.46 REQUIRED
+find_dependency(OMECompat)
+find_dependency(Boost 1.46
                 COMPONENTS date_time filesystem system iostreams
-                program_options regex)
-find_dependency(XercesC 3.0.0 REQUIRED)
-find_dependency(XalanC 1.10 REQUIRED)
+                program_options regex @OME_COMMON_OPTIONAL_BOOST_COMPONENTS@)
+find_dependency(XercesC 3.0.0)
+find_dependency(XalanC 1.10)
 
 include("${CMAKE_CURRENT_LIST_DIR}/OMECommonInternal.cmake")