[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:       2010-04-07 2:45:15
Message-ID: 20100407024515.20C72AC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1111931 by rkcosta:

Move plugins/config-ark.h to config.h in the toplevel directory.

 M  +2 -0      CMakeLists.txt  
 A             config.h.cmake  
 M  +0 -2      plugins/CMakeLists.txt  
 D             plugins/config-ark.h.cmake  
 M  +1 -1      plugins/libarchive/libarchivehandler.cpp  


--- trunk/KDE/kdeutils/ark/CMakeLists.txt #1111930:1111931
@@ -1,5 +1,7 @@
 project(ark)
 
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 add_subdirectory(part)
 add_subdirectory(app)
 add_subdirectory(plugins)
--- trunk/KDE/kdeutils/ark/plugins/CMakeLists.txt #1111930:1111931
@@ -2,8 +2,6 @@
 
 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-ark.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ark.h )
-
 if (LIBARCHIVE_FOUND)
     if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
         message(STATUS "Your libarchive does not have support for lzma and/or xz \
                archives. libarchive >= 2.7.0 is recommended.")
--- trunk/KDE/kdeutils/ark/plugins/libarchive/libarchivehandler.cpp #1111930:1111931
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "libarchivehandler.h"
-#include "config-ark.h"
 #include "kerfuffle/kerfuffle_export.h"
 #include "kerfuffle/queries.h"
 


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