[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/ark
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2011-05-08 17:30:06
Message-ID: 20110508173006.D7882AC76E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1230916 by rkcosta:

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.

Forward-port of r1230915.

CCBUG: 271553

 M  +3 -0      CMakeLists.txt  
 M  +0 -4      plugins/CMakeLists.txt  


--- trunk/KDE/kdeutils/ark/CMakeLists.txt #1230915:1230916
@@ -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)
--- trunk/KDE/kdeutils/ark/plugins/CMakeLists.txt #1230915:1230916
@@ -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 @@
     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 )


[prev in list] [next in list] [prev in thread] [next in thread]