blob: f157bf4031241e08302cfe734d32fcf1018f8649 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
KDE SVN revision r1230915.
Author: rkcosta (Raphael Kubo da Costa)
Date: Sun May 8 17:30:06 2011 +0000
Put the libarchive detection calls before configure_file().
The generated config.h was using some variables defined only after
plugins/CMakeLists.txt called macro_optional_find_package(LibArchive),
however the top-level CMakeLists.txt relied on these variables already
being set, which was never the case.
BUG: 271553
FIXED-IN: 4.6.4
--- ark/plugins/CMakeLists.txt
+++ ark/plugins/CMakeLists.txt
@@ -1,5 +1,3 @@
-macro_optional_find_package(LibArchive)
-
if (LIBARCHIVE_FOUND)
if( HAVE_LIBARCHIVE_READ_DISK_API )
if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
@@ -15,8 +13,6 @@ if (LIBARCHIVE_FOUND)
endif( HAVE_LIBARCHIVE_READ_DISK_API )
endif (LIBARCHIVE_FOUND)
-macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
-
add_subdirectory( clirarplugin )
add_subdirectory( cli7zplugin )
add_subdirectory( clizipplugin )
|
