From e2abb7ab4d3d355e2ea672ce52bc0198a12edcd0 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 26 Dec 2019 17:13:16 +0200 Subject: [PATCH 1/2] Update according to latest BoostInstall changes --- CMakeLists.txt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb9f3493..8cbd09a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright 2018 Mike Dev +# Copyright 2019 Peter Dimov # Distributed under the Boost Software License, Version 1.0. # See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt # @@ -18,20 +19,12 @@ project(boost_config VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) add_library(boost_config INTERFACE) add_library(Boost::config ALIAS boost_config) -set_property(TARGET boost_config PROPERTY EXPORT_NAME config) - -target_include_directories(boost_config - INTERFACE - $ - $ -) +target_include_directories(boost_config INTERFACE include) include(BoostInstall OPTIONAL RESULT_VARIABLE HAVE_BOOST_INSTALL) if(HAVE_BOOST_INSTALL) - install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - boost_install(boost_config) + boost_install(TARGETS boost_config HEADER_DIRECTORY include/) endif() From c99d0326b3ccc1c00aa0b4b6f36c42073bfcb39a Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 27 Dec 2019 04:19:00 +0200 Subject: [PATCH 2/2] Disable installation without the superproject; add comments --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cbd09a0..2cff703d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,9 @@ # DO NOT RELY ON THE CONTENTS OF THIS FILE!!! # +# We support CMake 3.5, but prefer 3.16 policies and behavior cmake_minimum_required(VERSION 3.5...3.16) + project(boost_config VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) add_library(boost_config INTERFACE) @@ -21,10 +23,12 @@ add_library(Boost::config ALIAS boost_config) target_include_directories(boost_config INTERFACE include) -include(BoostInstall OPTIONAL RESULT_VARIABLE HAVE_BOOST_INSTALL) +# boost_install requires PROJECT_VERSION +# Without the superproject, we don't have any, so skip installation -if(HAVE_BOOST_INSTALL) +if(BOOST_SUPERPROJECT_VERSION) - boost_install(TARGETS boost_config HEADER_DIRECTORY include/) + include(BoostInstall) + boost_install(TARGETS boost_config HEADER_DIRECTORY include/) endif()