Compare commits
29 Commits
Author | SHA1 | Date |
---|---|---|
|
ac981c4c34 | |
|
7ace1caee1 | |
|
e349a8d008 | |
|
204f5b754b | |
|
0da1d119f2 | |
|
5edb1df078 | |
|
80b881f325 | |
|
598efb2e52 | |
|
e8f28e03f2 | |
|
42b37ffe45 | |
|
78af738e8a | |
|
44e6870767 | |
|
cc1b529928 | |
|
ca56dc205e | |
|
e522a6d1be | |
|
47b114c656 | |
|
9961c45e61 | |
|
83882dc510 | |
|
1892a58ee9 | |
|
4d31d974d5 | |
|
3f52c045d7 | |
|
0e22de8b1b | |
|
d24984012a | |
|
d32134d9f5 | |
|
ee701e9d46 | |
|
629b826aa4 | |
|
70ead984a3 | |
|
1f5114816a | |
|
8dd6230b6d |
|
@ -1,2 +1,12 @@
|
||||||
/leatherman-1.3.0.tar.gz
|
/leatherman-1.3.0.tar.gz
|
||||||
/leatherman-1.6.1.tar.gz
|
/leatherman-1.6.1.tar.gz
|
||||||
|
/leatherman-1.10.0.tar.gz
|
||||||
|
/leatherman-1.12.0.tar.gz
|
||||||
|
/leatherman-1.12.4.tar.gz
|
||||||
|
/leatherman-1.12.5.tar.gz
|
||||||
|
/leatherman-1.12.6.tar.gz
|
||||||
|
/leatherman-1.12.7.tar.gz
|
||||||
|
/leatherman-1.12.8.tar.gz
|
||||||
|
/leatherman-1.12.9.tar.gz
|
||||||
|
/leatherman-1.12.10.tar.gz
|
||||||
|
/leatherman-1.12.11.tar.gz
|
||||||
|
|
|
@ -0,0 +1,101 @@
|
||||||
|
--- a/nowide/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/nowide/CMakeLists.txt 2021-03-09 08:57:57.469391575 -0600
|
||||||
|
@@ -1,7 +1,5 @@
|
||||||
|
find_package(Boost 1.54 REQUIRED)
|
||||||
|
|
||||||
|
-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
|
||||||
|
-add_leatherman_headers(../vendor/nowide/include/boost)
|
||||||
|
if(WIN32)
|
||||||
|
add_leatherman_library(../vendor/nowide/src/iostream.cpp)
|
||||||
|
endif()
|
||||||
|
--- a/execution/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/execution/CMakeLists.txt 2021-03-09 08:59:46.136860198 -0600
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
|
||||||
|
+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
|
||||||
|
|
||||||
|
add_leatherman_deps("${Boost_LIBRARIES}")
|
||||||
|
if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
|
||||||
|
@@ -10,7 +10,6 @@
|
||||||
|
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
||||||
|
|
||||||
|
leatherman_dependency(util)
|
||||||
|
-leatherman_dependency(nowide)
|
||||||
|
leatherman_dependency(locale)
|
||||||
|
leatherman_dependency(logging)
|
||||||
|
leatherman_dependency(file_util)
|
||||||
|
--- a/file_util/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/file_util/CMakeLists.txt 2021-03-09 09:00:26.641683668 -0600
|
||||||
|
@@ -1,9 +1,8 @@
|
||||||
|
-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
|
||||||
|
+find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
|
||||||
|
|
||||||
|
add_leatherman_deps("${Boost_LIBRARIES}")
|
||||||
|
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
||||||
|
|
||||||
|
-leatherman_dependency(nowide)
|
||||||
|
leatherman_dependency(locale)
|
||||||
|
leatherman_dependency(logging)
|
||||||
|
leatherman_dependency(util)
|
||||||
|
--- a/logging/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/logging/CMakeLists.txt 2021-03-09 09:01:03.565522737 -0600
|
||||||
|
@@ -4,7 +4,6 @@
|
||||||
|
add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
||||||
|
|
||||||
|
-leatherman_dependency(nowide)
|
||||||
|
leatherman_dependency(locale)
|
||||||
|
|
||||||
|
if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
|
||||||
|
--- a/tests/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/tests/CMakeLists.txt 2021-03-09 09:01:47.352331908 -0600
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
|
||||||
|
+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide)
|
||||||
|
if (LEATHERMAN_USE_LOCALES)
|
||||||
|
set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
|
||||||
|
endif()
|
||||||
|
-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
||||||
|
+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
||||||
|
|
||||||
|
include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS})
|
||||||
|
add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})
|
||||||
|
--- a/file_util/src/file.cc~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/file_util/src/file.cc 2021-03-09 09:02:58.297022731 -0600
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#include <leatherman/file_util/file.hpp>
|
||||||
|
#include <boost/nowide/fstream.hpp>
|
||||||
|
-#include <boost/nowide/cenv.hpp>
|
||||||
|
+#include <boost/nowide/cstdlib.hpp>
|
||||||
|
#include <boost/filesystem.hpp>
|
||||||
|
#include <sstream>
|
||||||
|
#include <leatherman/logging/logging.hpp>
|
||||||
|
--- a/util/src/environment.cc~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/util/src/environment.cc 2021-03-09 09:03:39.013845293 -0600
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
#include <leatherman/util/environment.hpp>
|
||||||
|
-#include <boost/nowide/cenv.hpp>
|
||||||
|
+#include <boost/nowide/cstdlib.hpp>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
--- a/util/tests/environment.cc~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/util/tests/environment.cc 2021-03-09 09:04:22.487655817 -0600
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#include <catch.hpp>
|
||||||
|
#include <leatherman/util/environment.hpp>
|
||||||
|
-#include <boost/nowide/cenv.hpp>
|
||||||
|
+#include <boost/nowide/cstdlib.hpp>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
using namespace leatherman::util;
|
||||||
|
--- a/util/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/util/CMakeLists.txt 2021-03-18 09:40:55.004699613 -0500
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
find_package(Boost 1.54 REQUIRED date_time chrono system)
|
||||||
|
|
||||||
|
-add_leatherman_deps(${Boost_LIBRARIES})
|
||||||
|
+add_leatherman_deps(${Boost_LIBRARIES} -lboost_nowide)
|
||||||
|
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
||||||
|
|
||||||
|
leatherman_dependency(nowide)
|
|
@ -0,0 +1,38 @@
|
||||||
|
diff --git a/curl/src/client.cc b/curl/src/client.cc
|
||||||
|
index 558db6d..d27bb36 100644
|
||||||
|
--- a/curl/src/client.cc
|
||||||
|
+++ b/curl/src/client.cc
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#include <cstddef>
|
||||||
|
#include <leatherman/curl/client.hpp>
|
||||||
|
#include <leatherman/curl/request.hpp>
|
||||||
|
#include <leatherman/curl/response.hpp>
|
||||||
|
diff --git a/util/src/posix/scoped_descriptor.cc b/util/src/posix/scoped_descriptor.cc
|
||||||
|
index 6fd1495..8294d0b 100644
|
||||||
|
--- a/util/src/posix/scoped_descriptor.cc
|
||||||
|
+++ b/util/src/posix/scoped_descriptor.cc
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+#include <cstddef>
|
||||||
|
+
|
||||||
|
#include <leatherman/util/posix/scoped_descriptor.hpp>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
diff --git a/util/src/scope_exit.cc b/util/src/scope_exit.cc
|
||||||
|
index 764c2fb..441855a 100644
|
||||||
|
--- a/util/src/scope_exit.cc
|
||||||
|
+++ b/util/src/scope_exit.cc
|
||||||
|
@@ -1,3 +1,4 @@
|
||||||
|
+#include <cstddef>
|
||||||
|
#include <leatherman/util/scope_exit.hpp>
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
diff --git a/util/src/scoped_env.cc b/util/src/scoped_env.cc
|
||||||
|
index 6c6a041..df26645 100644
|
||||||
|
--- a/util/src/scoped_env.cc
|
||||||
|
+++ b/util/src/scoped_env.cc
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+#include <cstddef>
|
||||||
|
+
|
||||||
|
#include <leatherman/util/scoped_env.hpp>
|
||||||
|
#include <leatherman/util/environment.hpp>
|
||||||
|
|
115
leatherman.spec
115
leatherman.spec
|
@ -1,31 +1,27 @@
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
||||||
%global boost_suffix 169
|
|
||||||
%global cmake_suffix 3
|
|
||||||
%global cmake %%cmake%{?cmake_suffix}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: leatherman
|
Name: leatherman
|
||||||
Version: 1.6.1
|
Version: 1.12.11
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Collection of C++ and CMake utility libraries
|
Summary: Collection of C++ and CMake utility libraries
|
||||||
|
|
||||||
# leatherman is ASL 2.0
|
# leatherman is ASL 2.0
|
||||||
# bundled rapidjson is MIT
|
# bundled rapidjson is MIT
|
||||||
License: ASL 2.0 and MIT
|
License: Apache-2.0 AND MIT
|
||||||
URL: https://github.com/puppetlabs/leatherman
|
URL: https://github.com/puppetlabs/leatherman
|
||||||
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# This unbundles boost-nowide and the boost libraries do not need
|
# This unbundles boost-nowide and the boost libraries do not need
|
||||||
# to have the path to nowide added as it's included already
|
# to have the path to nowide added as it's included already
|
||||||
Patch0: shared_nowide.patch
|
Patch0: leatherman-1.12.4-shared_nowide.patch
|
||||||
|
Patch1: system-catch.patch
|
||||||
|
Patch2: %{name}-gcc11.patch
|
||||||
|
|
||||||
BuildRequires: cmake%{?cmake_suffix} >= 3.2.2
|
BuildRequires: cmake >= 3.2.2
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: boost%{?boost_suffix}-devel >= 1.54
|
BuildRequires: boost-devel >= 1.73
|
||||||
BuildRequires: boost-nowide-devel
|
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
|
BuildRequires: catch1-devel
|
||||||
Provides: bundled(rapidjson) = 1.0.2
|
Provides: bundled(rapidjson) = 1.0.2
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -34,8 +30,8 @@ Provides: bundled(rapidjson) = 1.0.2
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
# Building againse leatherman requires the boost nowide headers present
|
# Building against leatherman requires the boost nowide headers present
|
||||||
Requires: boost-nowide-devel
|
Requires: boost-devel
|
||||||
# Strictly speaking, it is needed only if curl feature is activated
|
# Strictly speaking, it is needed only if curl feature is activated
|
||||||
Requires: libcurl-devel%{?_isa}
|
Requires: libcurl-devel%{?_isa}
|
||||||
|
|
||||||
|
@ -54,19 +50,14 @@ sed -i -e "s/\s*-Werror\s*//g" cmake/cflags.cmake
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake . -B%{_target_platform} \
|
%cmake . -B%{_target_platform} \
|
||||||
-DBOOST_INCLUDEDIR=%{_includedir}/boost%{?boost_suffix} \
|
|
||||||
-DBOOST_LIBRARYDIR=%{_libdir}/boost%{?boost_suffix} \
|
|
||||||
-DLEATHERMAN_SHARED=ON \
|
-DLEATHERMAN_SHARED=ON \
|
||||||
-DLEATHERMAN_DEBUG=ON \
|
-DLEATHERMAN_DEBUG=ON \
|
||||||
|
-DLEATHERMAN_CATCH_INCLUDE=%{_includedir}/catch \
|
||||||
%{nil}
|
%{nil}
|
||||||
%make_build -C %{_target_platform}
|
%make_build -C %{_target_platform}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install -C %{_target_platform}
|
%make_install -C %{_target_platform}
|
||||||
%if %{defined cmake_suffix}
|
|
||||||
mkdir -p %{buildroot}%{_libdir}/cmake%{cmake_suffix}
|
|
||||||
mv %{buildroot}%{_libdir}/cmake/%{name} %{buildroot}%{_libdir}/cmake%{cmake_suffix}/
|
|
||||||
%endif
|
|
||||||
%find_lang %{name}_logging
|
%find_lang %{name}_logging
|
||||||
%find_lang %{name}_locale
|
%find_lang %{name}_locale
|
||||||
|
|
||||||
|
@ -79,10 +70,88 @@ mv %{buildroot}%{_libdir}/cmake/%{name} %{buildroot}%{_libdir}/cmake%{cmake_suff
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/%{name}
|
%{_includedir}/%{name}
|
||||||
%{_libdir}/%{name}*.so
|
%{_libdir}/%{name}*.so
|
||||||
%dir %{_libdir}/cmake%{?cmake_suffix}
|
%dir %{_libdir}/cmake
|
||||||
%{_libdir}/cmake%{?cmake_suffix}/%{name}/
|
%{_libdir}/cmake/%{name}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 24 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.12.11-1
|
||||||
|
- 1.12.11
|
||||||
|
|
||||||
|
* Tue Oct 17 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.12.10-1
|
||||||
|
- 1.12.10
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.9-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Mar 04 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.12.9-4
|
||||||
|
- migrated to SPDX license
|
||||||
|
|
||||||
|
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 1.12.9-3
|
||||||
|
- Rebuilt for Boost 1.81
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Oct 17 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.12.9-1
|
||||||
|
- 1.12.9
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.12.8-1
|
||||||
|
- 1.12.8
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.7-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 1.12.7-3
|
||||||
|
- Rebuilt for Boost 1.78
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.7-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 19 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.12.7-1
|
||||||
|
- 1.12.7
|
||||||
|
|
||||||
|
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 1.12.6-3
|
||||||
|
- Rebuilt for Boost 1.76
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 13 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.6-1
|
||||||
|
- 1.12.6
|
||||||
|
|
||||||
|
* Fri Jun 11 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.5-1
|
||||||
|
- 1.12.5
|
||||||
|
|
||||||
|
* Thu Mar 18 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.4-2
|
||||||
|
- Link leatherman_util against boost_nowide.
|
||||||
|
|
||||||
|
* Tue Mar 09 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.4-1
|
||||||
|
- 1.12.4
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 1.12.0-5
|
||||||
|
- Rebuilt for Boost 1.75
|
||||||
|
|
||||||
|
* Wed Nov 04 2020 Jeff Law <law@redhat.com> - 1.12.0-4
|
||||||
|
- Fix missing #includes for gcc-11
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 03 2020 Jonathan Wakely <jwakely@redhat.com> - 1.12.0-2
|
||||||
|
- Link libraries to libboost_nowide.so
|
||||||
|
|
||||||
|
* Wed Jun 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.12.0-1
|
||||||
|
- Update to 1.12.0
|
||||||
|
|
||||||
|
* Tue Jun 02 2020 Jonathan Wakely <jwakely@redhat.com> - 1.10.0-2
|
||||||
|
- Rebuilt and patched for Boost 1.73
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Adam Tkac <vonsch@gmail.com> - 1.10.1-1
|
||||||
|
- update to 1.10.0
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt
|
|
||||||
index ff9dba6..5d1b9ce 100644
|
|
||||||
--- a/nowide/CMakeLists.txt
|
|
||||||
+++ b/nowide/CMakeLists.txt
|
|
||||||
@@ -1,7 +1,5 @@
|
|
||||||
find_package(Boost 1.54 REQUIRED)
|
|
||||||
|
|
||||||
-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
|
|
||||||
-add_leatherman_headers(../vendor/nowide/include/boost)
|
|
||||||
if(WIN32)
|
|
||||||
add_leatherman_library(../vendor/nowide/src/iostream.cpp)
|
|
||||||
endif()
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (leatherman-1.6.1.tar.gz) = 0803b985b57bd5e34ba31137b31fdfece53cb545dffb6a9447aa3de0353c9300e2d9e41b2b4f761b7683e02ed6577decfb1938d238314fd8439eccb16aa9475a
|
SHA512 (leatherman-1.12.11.tar.gz) = 26fb96a2f8bb34efe4df1220db18f9816ecd3b34d3ef1e84ecfda8833318f7e4f3dcd93535034669110e62fa69bbf9c43599d84739321c6d0075475cd2de7671
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600
|
||||||
|
+++ b/CMakeLists.txt 2021-03-09 09:33:46.038471009 -0600
|
||||||
|
@@ -65,7 +65,6 @@
|
||||||
|
file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES */src/*.cc */inc/*.hpp)
|
||||||
|
add_subdirectory(locales)
|
||||||
|
|
||||||
|
-add_leatherman_dir(catch EXCLUDE_FROM_VARS)
|
||||||
|
add_leatherman_dir(nowide)
|
||||||
|
add_leatherman_dir(util)
|
||||||
|
add_leatherman_dir(locale)
|
Loading…
Reference in New Issue