Compare commits
10 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
12d7f90e56 | ||
02c9c57553 | |||
b14b1c21c0 | |||
4d2e2a0278 | |||
5abbf8a681 | |||
d0f725c0ea | |||
7a2f9424d9 | |||
|
f6e063d679 | ||
e5e296c051 | |||
f954de680b |
@@ -1,44 +0,0 @@
|
||||
From 050ccd8badc6c706c4d20b3db48b319cc5bd9187 Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly <vitaly@easycoding.org>
|
||||
Date: Wed, 12 Mar 2025 09:59:07 +0100
|
||||
Subject: [PATCH] Added compatibility with CMake 4.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
test/add-subdirectory-test/CMakeLists.txt | 2 +-
|
||||
test/find-package-test/CMakeLists.txt | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a6e4e86e..110d3dd7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -17,7 +17,7 @@
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
-cmake_minimum_required(VERSION 3.1...3.19)
|
||||
+cmake_minimum_required(VERSION 3.5...3.19)
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
|
||||
include(cxxopts)
|
||||
diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt
|
||||
index ec14d597..8bf81e3a 100644
|
||||
--- a/test/add-subdirectory-test/CMakeLists.txt
|
||||
+++ b/test/add-subdirectory-test/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.1)
|
||||
+cmake_minimum_required(VERSION 3.5...3.19)
|
||||
|
||||
project(cxxopts-test)
|
||||
|
||||
diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt
|
||||
index b88d7c9d..0bc60384 100644
|
||||
--- a/test/find-package-test/CMakeLists.txt
|
||||
+++ b/test/find-package-test/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.1)
|
||||
+cmake_minimum_required(VERSION 3.5...3.19)
|
||||
|
||||
project(cxxopts-test)
|
||||
|
BIN
cxxopts-3.2.1.tar.gz
(Stored with Git LFS)
BIN
cxxopts-3.2.1.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
cxxopts-3.3.1.tar.gz
(Stored with Git LFS)
Normal file
BIN
cxxopts-3.3.1.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 1 06:07:59 UTC 2025 - Jiri Slaby <jslaby@suse.cz>
|
||||
|
||||
- fix build with gcc 15 ("Added missing header" below)
|
||||
- update to 3.3.1:
|
||||
* Added missing version bump
|
||||
* Added missing header for GCC 15
|
||||
* Fix some CMake packaging problems
|
||||
* `as_optional`
|
||||
* `ParseResult::contains`
|
||||
* `std::filesystem` support
|
||||
* CMake 4 compatibility
|
||||
- remove (is upstream):
|
||||
cxxopts-3.2.1-cmake4.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 17 17:08:04 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
11
cxxopts.spec
11
cxxopts.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package cxxopts
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@@ -18,13 +18,12 @@
|
||||
|
||||
|
||||
Name: cxxopts
|
||||
Version: 3.2.1
|
||||
Version: 3.3.1
|
||||
Release: 0
|
||||
Summary: C++ command line option parser
|
||||
License: MIT
|
||||
URL: https://github.com/jarro2783/cxxopts
|
||||
Source0: https://github.com/jarro2783/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: cxxopts-3.2.1-cmake4.patch
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: cmake
|
||||
|
||||
@@ -48,7 +47,7 @@ It requires and makes use of C++11 <regex>.
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DCXXOPTS_BUILD_EXAMPLES:BOOL=oFF \
|
||||
-DCXXOPTS_BUILD_EXAMPLES:BOOL=OFF \
|
||||
-DCXXOPTS_BUILD_TESTS:BOOL=ON
|
||||
%cmake_build
|
||||
|
||||
@@ -62,7 +61,7 @@ It requires and makes use of C++11 <regex>.
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_includedir}/%{name}.hpp
|
||||
%{_libdir}/cmake/%{name}/
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_datadir}/cmake/%{name}/
|
||||
%{_datadir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
|
Reference in New Issue
Block a user