From af83cb97bb9a339f1f485a83bb9865ef5759ad51 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Sun, 14 Jul 2024 04:19:24 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20remove=20range-v3=20from=20depen?= =?UTF-8?q?ds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 +------- README.md | 1 - meson.build | 4 ---- subprojects/packagefiles/range-v3/meson.build | 8 -------- subprojects/range-v3.wrap | 8 -------- 5 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 subprojects/packagefiles/range-v3/meson.build delete mode 100644 subprojects/range-v3.wrap diff --git a/CMakeLists.txt b/CMakeLists.txt index a927eb3..ad98d0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,12 +51,6 @@ CPMAddPackage( GIT_TAG c241d64279d30a013be2601d42564280f950bcb8 EXCLUDE_FROM_ALL YES ) -CPMAddPackage( - NAME range-v3 - GITHUB_REPOSITORY ericniebler/range-v3 - GIT_TAG 9aa41d6b8ded2cf5e8007e66a0efd1ab33dbf9a5 - EXCLUDE_FROM_ALL YES -) find_package(PolkitQt6-1 REQUIRED) @@ -138,7 +132,7 @@ enable_sanitizers(project_options) include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}) -target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options Qt6::Widgets Qt6::Concurrent Threads::Threads fmt::fmt range-v3::range-v3 frozen::frozen PkgConfig::LIBALPM PkgConfig::LIBGLIB) +target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options Qt6::Widgets Qt6::Concurrent Threads::Threads fmt::fmt frozen::frozen PkgConfig::LIBALPM PkgConfig::LIBGLIB) option(ENABLE_UNITY "Enable Unity builds of projects" OFF) if(ENABLE_UNITY) diff --git a/README.md b/README.md index 4a123c0..57e17d7 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,3 @@ Second, build it: * [Qt](https://www.qt.io) used for GUI. * [A modern formatting library](https://github.com/fmtlib/fmt) used for formatting strings, output and logging. -* [Ranges](https://github.com/ericniebler/range-v3) used for ranges support with clang. diff --git a/meson.build b/meson.build index ceb365b..f0e6875 100644 --- a/meson.build +++ b/meson.build @@ -127,10 +127,6 @@ endif add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'cpp') deps = [qt6_dep, fmt, libalpm, glib] -if cc.get_id() == 'clang' - ranges = dependency('range-v3', version : ['>=0.11.0']) - deps += [ranges] -endif prep = qt6.compile_moc( headers : ['src/km-window.hpp', 'src/conf-window.hpp', 'src/conf-options-page.hpp', 'src/conf-patches-page.hpp'] # These need to be fed through the moc tool before use. diff --git a/subprojects/packagefiles/range-v3/meson.build b/subprojects/packagefiles/range-v3/meson.build deleted file mode 100644 index 0ae2827..0000000 --- a/subprojects/packagefiles/range-v3/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('range-v3', 'cpp', version: '0.12.0', - license: 'Boost, libc++, Stepanov and McJones "Elements of Programming", SGI STL') - -range_inc = include_directories('include') - -range_dep = declare_dependency( - include_directories : range_inc -) diff --git a/subprojects/range-v3.wrap b/subprojects/range-v3.wrap deleted file mode 100644 index f5534c2..0000000 --- a/subprojects/range-v3.wrap +++ /dev/null @@ -1,8 +0,0 @@ -[wrap-git] -url = https://github.com/ericniebler/range-v3.git -revision = 4624c63972c6f2c2871c7b87813c42048ddb80ad - -patch_directory = range-v3 - -[provide] -range-v3 = range_dep