blob: fae223ae2a40b9bf4fce092b76574f2ac0ffe8ee (
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
|
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/CMakeLists.txt
+++ ark/CMakeLists.txt
@@ -1,5 +1,8 @@
project(ark)
+macro_optional_find_package(LibArchive)
+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.")
+
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_subdirectory(part)
|
