From 609a5c0cd1b018103ad93ec07dbe491e059cdb0f Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 26 Dec 2019 17:16:45 +0200 Subject: [PATCH 1/2] Add CMake install support (needed by type_traits) --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33877bc..51bda0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,10 @@ # 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 -cmake_minimum_required(VERSION 3.5) -project(BoostStaticAssert LANGUAGES CXX) +cmake_minimum_required(VERSION 3.5...3.16) +project(BoostStaticAssert VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) add_library(boost_static_assert INTERFACE) add_library(Boost::static_assert ALIAS boost_static_assert) @@ -14,3 +15,11 @@ target_link_libraries(boost_static_assert INTERFACE Boost::config ) + +include(BoostInstall OPTIONAL RESULT_VARIABLE HAVE_BOOST_INSTALL) + +if(HAVE_BOOST_INSTALL) + + boost_install(TARGETS boost_static_assert HEADER_DIRECTORY include/) + +endif() From f970afff9da332fbbc6bee4472edcfb5d355b388 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 27 Dec 2019 04:22:53 +0200 Subject: [PATCH 2/2] Disable installation without the superproject; add comments --- CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51bda0d..cedc466 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,10 @@ # 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 +# We support CMake 3.5, but prefer 3.16 policies and behavior cmake_minimum_required(VERSION 3.5...3.16) -project(BoostStaticAssert VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) + +project(boost_static_assert VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) add_library(boost_static_assert INTERFACE) add_library(Boost::static_assert ALIAS boost_static_assert) @@ -16,10 +18,12 @@ target_link_libraries(boost_static_assert Boost::config ) -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_static_assert HEADER_DIRECTORY include/) + include(BoostInstall) + boost_install(TARGETS boost_static_assert HEADER_DIRECTORY include/) endif()