fix find_dependency boost (with 1.70) #1296

feelpp · Dec 9, 2019 · 8730c7c · 8730c7c
1 parent 80dd7c8
commit 8730c7c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/feelpp/cmake/modules/Feel++Config.cmake.in b/feelpp/cmake/modules/Feel++Config.cmake.in
@@ -181,13 +181,13 @@ if (NOT FEELPP_DONT_SETUP_CMAKE)
 
   include(CMakeFindDependencyMacro)
 
-  if ( CMAKE_VERSION VERSION_LESS 3.10 )
-    find_dependency(MPI)
-    find_dependency(Boost ${BOOST_MIN_VERSION})
-  else()
-    find_dependency(MPI REQUIRED)
-    find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS_REQUIRED})
-  endif()
+  find_dependency(MPI REQUIRED)
+
+  # workaround bug https://github.com/boostorg/boost_install/issues/5
+  set(__org ${BUILD_SHARED_LIBS})
+  set(BUILD_SHARED_LIBS ON)
+  find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS_REQUIRED})
+  set(BUILD_SHARED_LIBS ${__org})
 
   if ( FEELPP_HAS_ANN )
     find_dependency( ANN )