libarchive: Do not build subdirectories not in reduced snapshot

Remove add_subdirectory() calls for directories not included in the
reduced libarchive snapshot.  Remove options that configure settings in
the missing directories.
This commit is contained in:
Brad King 2011-12-20 12:01:04 -05:00
parent d31bb538ef
commit 1d7ea8b629
2 changed files with 0 additions and 17 deletions

View File

@ -63,18 +63,9 @@ INCLUDE(AddTest28)
OPTION(ENABLE_NETTLE "Enable use of Nettle" ON) OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON) OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
OPTION(ENABLE_TAR "Enable tar building" ON)
OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" FALSE)
OPTION(ENABLE_CPIO "Enable cpio building" ON)
OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" FALSE)
OPTION(ENABLE_XATTR "Enable extended attribute support" ON) OPTION(ENABLE_XATTR "Enable extended attribute support" ON)
OPTION(ENABLE_ACL "Enable ACL support" ON) OPTION(ENABLE_ACL "Enable ACL support" ON)
OPTION(ENABLE_ICONV "Enable iconv support" ON) OPTION(ENABLE_ICONV "Enable iconv support" ON)
OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
IF(ENABLE_TEST)
ENABLE_TESTING()
ENDIF(ENABLE_TEST)
IF(WIN32) IF(WIN32)
SET(_WIN32_WINNT 0x0500 CACHE INTERNAL "Setting _WIN32_WINNT to 0x0500 for Windows 2000 APIs") SET(_WIN32_WINNT 0x0500 CACHE INTERNAL "Setting _WIN32_WINNT to 0x0500 for Windows 2000 APIs")
@ -1097,10 +1088,4 @@ IF(APPLE)
LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
ENDIF(APPLE) ENDIF(APPLE)
IF(ENABLE_TEST)
ADD_CUSTOM_TARGET(run_all_tests)
ENDIF(ENABLE_TEST)
add_subdirectory(libarchive) add_subdirectory(libarchive)
add_subdirectory(tar)
add_subdirectory(cpio)

View File

@ -168,5 +168,3 @@ INSTALL(TARGETS archive archive_static
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
INSTALL_MAN(${libarchive_MANS}) INSTALL_MAN(${libarchive_MANS})
INSTALL(FILES ${include_HEADERS} DESTINATION include) INSTALL(FILES ${include_HEADERS} DESTINATION include)
add_subdirectory(test)