From b7952cefdec21eaede0517987c5eaa282d196308 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 18 Dec 2023 14:27:13 +0800 Subject: [PATCH] cmake: remove fileset workaround --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ce48c2..840bf5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -428,7 +428,7 @@ jobs: run: | cd ../boost-root mkdir __build__ && cd __build__ - cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local .. + cmake -DBoost_DEBUG=ON -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local .. - name: Install run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 407ab4d..3b9f7e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,15 +8,13 @@ cmake_minimum_required(VERSION 3.5...3.16) project(boost_lockfree VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX) option(BOOST_LOCKFREE_BUILD_TESTS "Build boost::lockfree tests" OFF) -option(BOOST_LOCKFREE_USE_FILE_SET "Use FILE_SET for boost::lockfree" OFF) - add_library(boost_lockfree INTERFACE) add_library(Boost::lockfree ALIAS boost_lockfree) target_include_directories(boost_lockfree INTERFACE include) -if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.23 AND BOOST_LOCKFREE_USE_FILE_SET) +if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.23 ) set(Headers include/boost/lockfree/spsc_queue.hpp include/boost/lockfree/policies.hpp @@ -33,7 +31,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.23 AND BOOST_LOCKFREE_USE_FILE_SET) include/boost/lockfree/stack.hpp ) - target_sources(boost_lockfree PUBLIC FILE_SET HEADERS FILES ${Headers} ) + target_sources(boost_lockfree PUBLIC FILE_SET HEADERS BASE_DIRS include FILES ${Headers} ) endif() target_link_libraries(boost_lockfree