From 875c4c2f3fb664b8e846f051444a92a7e45f73ea Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Wed, 15 May 2019 12:55:15 +0100 Subject: [PATCH] restore ninja compatibility The ninja generator requires all generated libraries to be declared. This was missing in get_boost.cmake. --- cmake/get_boost.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/get_boost.cmake b/cmake/get_boost.cmake index ffe6d7cf69..1aff8a6aa9 100644 --- a/cmake/get_boost.cmake +++ b/cmake/get_boost.cmake @@ -62,6 +62,10 @@ macro(DOWNLOAD_BOOST) set(BOOTSTRAP_FILE_TYPE "sh") endif() + foreach(component ${BOOST_COMPONENTS}) + list(APPEND BOOST_BUILD_BYPRODUCTS /lib/${LIBRARY_PREFIX}boost_${component}${WINDOWS_LIB_NAME_SCHEME}${LIBRARY_SUFFIX}) + endforeach() + message(STATUS "Adding Boost components") include(ExternalProject) ExternalProject_Add( @@ -74,6 +78,7 @@ macro(DOWNLOAD_BOOST) CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_FILE_TYPE} --prefix=${BOOST_ROOT_DIR} BUILD_COMMAND ./b2 install ${BOOST_MAYBE_STATIC} --prefix=${BOOST_ROOT_DIR} variant=${VARIANT} ${WINDOWS_B2_OPTIONS} ${BOOST_COMPONENTS_FOR_BUILD} BUILD_IN_SOURCE true + BUILD_BYPRODUCTS ${BOOST_BUILD_BYPRODUCTS} INSTALL_COMMAND "" INSTALL_DIR ${BOOST_ROOT_DIR} )