public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Vitaly Zaitsev <vitaly@easycoding.org>
To: git-commits@fedoraproject.org
Subject: [rpms/cxxopts] epel10: Rebased patch to latest master branch.
Date: Tue, 22 Sep 2026 01:31:35 GMT [thread overview]
Message-ID: <179004069556.1.16170259250181764780.rpms-cxxopts-20493635907d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cxxopts
Branch : epel10
Commit : 20493635907dd6d1473e202c19cd3a54911d28fd
Author : Vitaly Zaitsev <vitaly@easycoding.org>
Date : 2020-08-18T14:47:24+02:00
Stats : +18/-18 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/cxxopts/c/20493635907dd6d1473e202c19cd3a54911d28fd?branch=epel10
Log:
Rebased patch to latest master branch.
---
diff --git a/cxxopts-fix-installation.patch b/cxxopts-fix-installation.patch
index bbeb198..cc8042c 100644
--- a/cxxopts-fix-installation.patch
+++ b/cxxopts-fix-installation.patch
@@ -1,26 +1,26 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 440490b..2faafba 100644
+index 1b524f7..3e9b862 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -70,8 +70,9 @@ target_include_directories(cxxopts INTERFACE
- $<INSTALL_INTERFACE:include>
+@@ -73,8 +73,9 @@ target_include_directories(cxxopts INTERFACE
)
-+include(GNUInstallDirs)
- include(CMakePackageConfigHelpers)
--set(CXXOPTS_CMAKE_DIR "lib/cmake/cxxopts" CACHE STRING
-+set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/cxxopts" CACHE STRING
- "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
- set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake")
- set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake")
-@@ -97,8 +98,8 @@ install(EXPORT ${targets_export_name} DESTINATION ${CXXOPTS_CMAKE_DIR}
- NAMESPACE cxxopts::)
+ if(CXXOPTS_ENABLE_INSTALL)
++ include(GNUInstallDirs)
+ include(CMakePackageConfigHelpers)
+- set(CXXOPTS_CMAKE_DIR "lib/cmake/cxxopts" CACHE STRING
++ set(CXXOPTS_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/cxxopts" CACHE STRING
+ "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
+ set(version_config "${PROJECT_BINARY_DIR}/cxxopts-config-version.cmake")
+ set(project_config "${PROJECT_BINARY_DIR}/cxxopts-config.cmake")
+@@ -100,8 +101,8 @@ if(CXXOPTS_ENABLE_INSTALL)
+ NAMESPACE cxxopts::)
- # Install the header file and export the target
--install(TARGETS cxxopts EXPORT ${targets_export_name} DESTINATION lib)
--install(FILES ${PROJECT_SOURCE_DIR}/include/cxxopts.hpp DESTINATION include)
-+install(TARGETS cxxopts EXPORT ${targets_export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES ${PROJECT_SOURCE_DIR}/include/cxxopts.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ # Install the header file and export the target
+- install(TARGETS cxxopts EXPORT ${targets_export_name} DESTINATION lib)
+- install(FILES ${PROJECT_SOURCE_DIR}/include/cxxopts.hpp DESTINATION include)
++ install(TARGETS cxxopts EXPORT ${targets_export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
++ install(FILES ${PROJECT_SOURCE_DIR}/include/cxxopts.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ endif()
add_subdirectory(src)
- add_subdirectory(test)
reply other threads:[~2026-09-22 1:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179004069556.1.16170259250181764780.rpms-cxxopts-20493635907d@fedoraproject.org \
--to=vitaly@easycoding.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox