mirror of
https://abf.rosa.ru/djam/tinyxml2.git
synced 2025-02-23 17:02:56 +00:00
Merge pull request #1 from djam/tinyxml2:rosa2023.1
Backports and update
This commit is contained in:
commit
1085ea0937
3 changed files with 4 additions and 34 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
tinyxml2-5.0.1.tar.gz: b9b5569343f5829345b1bdfe5d0c08c079286495
|
||||
tinyxml2-10.0.0.tar.gz: c9030c4bfa0f7cd5ea3a6669f8bf038a2ffcdfed
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
From f209bf66420c4149bb088bfb3d08f2ad845a5b5c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
|
||||
Date: Mon, 17 Jul 2017 15:50:34 +0200
|
||||
Subject: [PATCH] CMake: Respect libdir for config files
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cec4470..c647477 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -170,7 +170,7 @@ file(WRITE
|
||||
|
||||
install(FILES
|
||||
${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
|
||||
- DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
|
||||
|
||||
install(EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
- DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
|
||||
--
|
||||
2.13.2
|
||||
|
|
@ -1,18 +1,16 @@
|
|||
%define major 5
|
||||
%define major 10
|
||||
%define libname %mklibname %{name} _%{major}
|
||||
%define devname %mklibname %{name} -d
|
||||
|
||||
Summary: Simple, small and efficient C++ XML parser
|
||||
Name: tinyxml2
|
||||
Version: 5.0.1
|
||||
Version: 10.0.0
|
||||
Release: 1
|
||||
License: zlib
|
||||
Group: System/Libraries
|
||||
Url: http://www.grinninglizard.com/tinyxml2/
|
||||
Source0: https://github.com/leethomason/tinyxml2/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: FindTinyXML2.cmake
|
||||
# https://github.com/leethomason/tinyxml2/pull/587
|
||||
Patch0: 0001-CMake-Respect-libdir-for-config-files.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
|
||||
|
@ -68,7 +66,6 @@ for writing applications with the %{name} library.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake
|
||||
|
@ -87,6 +84,5 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindTinyXML2.c
|
|||
%check
|
||||
pushd build
|
||||
export LD_LIBRARY_PATH=`pwd`
|
||||
./xmltest
|
||||
./xmltest .././resources/
|
||||
popd
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue