mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
cli11: upgrade 1.8.0 -> 1.9.0
Variants of the patches are now included upstream so the local patching can be removed. Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
6105a7bd4d
commit
4e494eedfe
+1
-7
@@ -6,18 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733"
|
|||||||
SRCREV = "13becaddb657eacd090537719a669d66d393b8b2"
|
SRCREV = "13becaddb657eacd090537719a669d66d393b8b2"
|
||||||
PV .= "+git${SRCPV}"
|
PV .= "+git${SRCPV}"
|
||||||
|
|
||||||
SRC_URI += "gitsm://github.com/CLIUtils/CLI11 \
|
SRC_URI += "gitsm://github.com/CLIUtils/CLI11"
|
||||||
file://0001-Add-CLANG_TIDY-check.patch \
|
|
||||||
file://0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit cmake
|
inherit cmake
|
||||||
inherit ptest
|
inherit ptest
|
||||||
|
|
||||||
EXTRA_OECMAKE += "-DCLANG_TIDY=OFF"
|
|
||||||
DEPENDS += "boost"
|
|
||||||
|
|
||||||
# cli11 is a header only C++ library, so the main package will be empty.
|
# cli11 is a header only C++ library, so the main package will be empty.
|
||||||
RDEPENDS_${PN}-dev = ""
|
RDEPENDS_${PN}-dev = ""
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
From 902b251fd8d6408ee6623e7a92692948cf90187d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Tue, 12 Feb 2019 13:22:21 -0800
|
|
||||||
Subject: [PATCH] Add CLANG_TIDY check
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 7073a0b..2dd2c02 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -60,7 +60,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
- if(CMAKE_VERSION VERSION_GREATER 3.6)
|
|
||||||
+ if(CMAKE_VERSION VERSION_GREATER 3.6 AND CLANG_TIDY)
|
|
||||||
# Add clang-tidy if available
|
|
||||||
option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
|
|
||||||
find_program(
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Thu, 19 Dec 2019 16:26:39 -0800
|
|
||||||
Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 7073a0b..5236fd2 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -120,17 +120,18 @@ endif()
|
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY)
|
|
||||||
|
|
||||||
+include(GNUInstallDirs)
|
|
||||||
# These installs only make sense for a local project
|
|
||||||
if(CUR_PROJ)
|
|
||||||
# Make version available in the install
|
|
||||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake"
|
|
||||||
- DESTINATION lib/cmake/CLI11)
|
|
||||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
|
|
||||||
|
|
||||||
# Install the export target as a file
|
|
||||||
install(EXPORT CLI11Targets
|
|
||||||
FILE CLI11Config.cmake
|
|
||||||
NAMESPACE CLI11::
|
|
||||||
- DESTINATION lib/cmake/CLI11)
|
|
||||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
|
|
||||||
|
|
||||||
# Use find_package on the installed package
|
|
||||||
export(TARGETS CLI11
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user