From 8633dd554b9521062e15f839a936145aa2846cb8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 12 Jan 2023 05:38:07 +0200 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 835e143..6360a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright 2018, 2019 Peter Dimov +# Copyright 2018-2023 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 +# https://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) +# We support CMake 3.5, but prefer 3.20 policies and behavior +cmake_minimum_required(VERSION 3.5...3.20) project(boost_assert VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) @@ -16,12 +16,15 @@ target_link_libraries(boost_assert INTERFACE Boost::config ) -file(GLOB_RECURSE boost_assert_IDEFILES CONFIGURE_DEPENDS include/*.hpp) -source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_assert_IDEFILES}) -if (CMAKE_GENERATOR MATCHES "Visual Studio") - list(APPEND boost_assert_IDEFILES extra/boost_assert.natvis) + +if(CMAKE_VERSION VERSION_GREATER 3.18 AND CMAKE_GENERATOR MATCHES "Visual Studio") + + file(GLOB_RECURSE boost_assert_IDEFILES CONFIGURE_DEPENDS include/*.hpp) + source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_assert_IDEFILES}) + list(APPEND boost_assert_IDEFILES extra/boost_assert.natvis) + target_sources(boost_assert PRIVATE ${boost_assert_IDEFILES}) + endif() -target_sources(boost_assert PRIVATE ${boost_assert_IDEFILES}) # BUILD_TESTING is the standard CTest variable that enables testing