cmake: remove fileset workaround

boostorg · Dec 19, 2023 · b7952ce · b7952ce
1 parent fdbccb9
commit b7952ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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