Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh add_libarchive_script.patch, add DEP-3 header.

Browse Source
This commit is contained in:
Modestas Vainius 2010-07-02 03:14:19 +03:00
parent 421c05967e
commit 7e9387624b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/patches/add_libarchive_script.patch vendored
View File

@ -1,11 +1,10 @@
--- Description: add Findlibarchive.cmake needed to build with system libarchive
CMakeLists.txt | 3 +- Author: Kai Wasserbäch <debian@carbon-project.org>
Modules/Findlibarchive.cmake | 41 ++++++++++++++++++++++++++++ Forwarded: yes
Tests/CMakeTests/ModuleNoticesTest.cmake.in | 2 + Bug: http://public.kitware.com/Bug/view.php?id=10923
3 files changed, 45 insertions(+), 1 deletion(-) Origin: vendor
Last-Update: 2010-07-01
Index: b/CMakeLists.txt
===================================================================
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -265,7 +265,8 @@ MACRO (CMAKE_BUILD_UTILITIES) @@ -265,7 +265,8 @@ MACRO (CMAKE_BUILD_UTILITIES)
@ -18,8 +17,6 @@ Index: b/CMakeLists.txt
ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE) ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE)
SET(HAVE_LIBZ 1) SET(HAVE_LIBZ 1)
SET(HAVE_ZLIB_H 1) SET(HAVE_ZLIB_H 1)
Index: b/Modules/Findlibarchive.cmake
===================================================================
--- /dev/null --- /dev/null
+++ b/Modules/Findlibarchive.cmake +++ b/Modules/Findlibarchive.cmake
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
@ -64,8 +61,6 @@ Index: b/Modules/Findlibarchive.cmake
+ +
+ mark_as_advanced(LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT HAVE_LIBARCHIVE_LZMA_SUPPORT) + mark_as_advanced(LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY HAVE_LIBARCHIVE_GZIP_SUPPORT HAVE_LIBARCHIVE_LZMA_SUPPORT)
+endif (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR) +endif (LIBARCHIVE_LIBRARY AND LIBARCHIVE_INCLUDE_DIR)
Index: b/Tests/CMakeTests/ModuleNoticesTest.cmake.in
===================================================================
--- a/Tests/CMakeTests/ModuleNoticesTest.cmake.in --- a/Tests/CMakeTests/ModuleNoticesTest.cmake.in
+++ b/Tests/CMakeTests/ModuleNoticesTest.cmake.in +++ b/Tests/CMakeTests/ModuleNoticesTest.cmake.in
@@ -22,6 +22,8 @@ string(REPLACE "\r\r" "\r" notice_regex @@ -22,6 +22,8 @@ string(REPLACE "\r\r" "\r" notice_regex