diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index 6ea72bb..85c5ce0 100644 --- a/ark/CMakeLists.txt +++ b/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) diff --git a/ark/plugins/CMakeLists.txt b/ark/plugins/CMakeLists.txt index a8c4e44..e3cb9ec 100644 --- a/ark/plugins/CMakeLists.txt +++ b/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 )