From 3773c1ab43af2b3b0f871436cdf84fa8568a0952 Mon Sep 17 00:00:00 2001 From: LAVAUX Guilhem Date: Tue, 14 Apr 2020 17:46:14 +0200 Subject: [PATCH] Add support for newer boost --- external/external_build.cmake | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/external_build.cmake b/external/external_build.cmake index 458b803..780dff6 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -252,7 +252,7 @@ ELSE (INTERNAL_BOOST) endif() if (${Boost_VERSION} VERSION_GREATER_EQUAL 1.70.0) set(Boost_DEP Boost::headers) - set(Boost_TARGET Boost::headers PARENT_SCOPE) + set(Boost_TARGET Boost::headers) endif() endif (INTERNAL_BOOST) mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3d6b1ff..4f39695 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ if (BUILD_SHARED_LIBS) endif(BUILD_STATIC_LIBS) else (BUILD_SHARED_LIBS) add_library(CosmoTool STATIC ${CosmoTool_SRCS} $) - target_link_libraries(CosmoTool) + target_link_libraries(CosmoTool ${CosmoTool_LIBS}) set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON) add_dependencies(CosmoTool ${cosmotool_DEPS}) endif (BUILD_SHARED_LIBS)