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

List:       kde-commits
Subject:    KDE/kdeutils
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2010-08-08 18:42:03
Message-ID: 20100808184203.04792AC73B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1160661 by mjansen:

My system has a libarchive-devel 2.5.5 which does not provide all needed
symbols. For now do not enable the libarchive plugin in that case.

CCMAIL: kubito@gmail.com

 M  +10 -2     ark/plugins/CMakeLists.txt  
 M  +1 -0      cmake/modules/FindLibArchive.cmake  


--- trunk/KDE/kdeutils/ark/plugins/CMakeLists.txt #1160660:1160661
@@ -1,14 +1,22 @@
 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.")
-
 if (LIBARCHIVE_FOUND)
+    if( HAVE_LIBARCHIVE_READ_DISK_API )
     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.")
     endif( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT )
     add_subdirectory( libarchive )
+    else( HAVE_LIBARCHIVE_READ_DISK_API )
+        # Remove the cached variables from FindLibArchive.cmake
+        unset( LIBARCHIVE_FOUND )
+        unset( LIBARCHIVE_INCLUDE_DIR )
+        unset( LIBARCHIVE_LIBRARY )
+        message(STATUS "Your libarchive does not have support for archive_read_disk \
api. libarchive >= 2.6.0 is needed.") +    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 )
--- trunk/KDE/kdeutils/cmake/modules/FindLibArchive.cmake #1160660:1160661
@@ -32,6 +32,7 @@
     check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_gzip "" \
                HAVE_LIBARCHIVE_GZIP_SUPPORT)
     check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_lzma "" \
                HAVE_LIBARCHIVE_LZMA_SUPPORT)
     check_library_exists(${LIBARCHIVE_LIBRARY} archive_write_set_compression_xz "" \
HAVE_LIBARCHIVE_XZ_SUPPORT) +    check_library_exists(${LIBARCHIVE_LIBRARY} \
archive_read_disk_entry_from_file  "" HAVE_LIBARCHIVE_READ_DISK_API)  endif \
(LIBARCHIVE_LIBRARY)  
   include(FindPackageHandleStandardArgs)


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