From 7cf4521a1e1b9e8904a566b9da99d2b004bb0bfd Mon Sep 17 00:00:00 2001 From: Ben Deane Date: Thu, 5 Sep 2024 15:38:34 -0600 Subject: [PATCH 1/2] :fire: Remove GCC extension warning Use of the extension itself was removed in 61aae30 --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72abf7d..0411348 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,7 @@ add_library(stdx INTERFACE) target_include_directories(stdx INTERFACE include) target_compile_features(stdx INTERFACE cxx_std_${CMAKE_CXX_STANDARD}) target_compile_options( - stdx - INTERFACE - $<$:-Wno-gnu-string-literal-operator-template> - $<$:-Wno-missing-braces>) + stdx INTERFACE $<$:-Wno-missing-braces>) target_link_libraries_system(stdx INTERFACE boost_mp11 fmt::fmt-header-only) if(PROJECT_IS_TOP_LEVEL) From dacc6a1d5b4457fb68704423802a6321dad80010 Mon Sep 17 00:00:00 2001 From: Ben Deane Date: Thu, 5 Sep 2024 15:42:43 -0600 Subject: [PATCH 2/2] :construction_worker: Use `target_sources` with FILE_SETs --- CMakeLists.txt | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0411348..4464d9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,12 +22,56 @@ if(NOT DEFINED CMAKE_CXX_STANDARD) endif() add_library(stdx INTERFACE) -target_include_directories(stdx INTERFACE include) target_compile_features(stdx INTERFACE cxx_std_${CMAKE_CXX_STANDARD}) target_compile_options( stdx INTERFACE $<$:-Wno-missing-braces>) target_link_libraries_system(stdx INTERFACE boost_mp11 fmt::fmt-header-only) +target_sources( + stdx + INTERFACE FILE_SET + stdx + TYPE + HEADERS + BASE_DIRS + include + FILES + include/stdx/algorithm.hpp + include/stdx/bit.hpp + include/stdx/bitset.hpp + include/stdx/byterator.hpp + include/stdx/cached.hpp + include/stdx/compiler.hpp + include/stdx/concepts.hpp + include/stdx/ct_conversions.hpp + include/stdx/ct_format.hpp + include/stdx/ct_string.hpp + include/stdx/cx_map.hpp + include/stdx/cx_multimap.hpp + include/stdx/cx_queue.hpp + include/stdx/cx_set.hpp + include/stdx/cx_vector.hpp + include/stdx/detail/list_common.hpp + include/stdx/for_each_n_args.hpp + include/stdx/functional.hpp + include/stdx/function_traits.hpp + include/stdx/intrusive_forward_list.hpp + include/stdx/intrusive_list.hpp + include/stdx/iterator.hpp + include/stdx/memory.hpp + include/stdx/numeric.hpp + include/stdx/optional.hpp + include/stdx/panic.hpp + include/stdx/priority.hpp + include/stdx/ranges.hpp + include/stdx/span.hpp + include/stdx/tuple_algorithms.hpp + include/stdx/tuple_destructure.hpp + include/stdx/tuple.hpp + include/stdx/type_traits.hpp + include/stdx/udls.hpp + include/stdx/utility.hpp) + if(PROJECT_IS_TOP_LEVEL) add_docs(docs) add_subdirectory(test)