Split a CMakeLists.txt into each subdirectory, and remove

useless '#include LIST_H'. It was used for out-of-source build
with the previous CMakeLists.txt.

SVN-Revision: 823

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b4679b77204c9371c2139ddcd1ca8daa2832983..010bb10a718dfa813440502a067f64aa2b6fde29 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,17 +43,17 @@ IF(ENABLE_TEST)
 ENDIF(ENABLE_TEST)
 
 #
-INCLUDE(CheckLibraryExists)
+INCLUDE(CheckFileOffsetBits)
 INCLUDE(CheckFuncs)
 INCLUDE(CheckHeaders)
 INCLUDE(CheckHeaderDirent)
 INCLUDE(CheckHeaderSTDC)
 INCLUDE(CheckIncludeFile)
+INCLUDE(CheckLibraryExists)
 INCLUDE(CheckStructMember)
 INCLUDE(CheckSymbolExists)
 INCLUDE(CheckTypeExists)
 INCLUDE(CheckTypeSize)
-INCLUDE(CheckFileOffsetBits)
 
 #
 # Generate list.h
@@ -65,12 +65,12 @@ MACRO (GENERATE_LIST_H _listfile __list_sources)
     MESSAGE(STATUS "Generating ${_listfile}")
     FILE(WRITE ${_listfile} "")
     FOREACH (testfile ${ARGV})
-      IF (testfile MATCHES ".+/test_[^/]+[.]c$")
+      IF (testfile MATCHES "^test_[^/]+[.]c$")
         FILE(STRINGS ${testfile} testvar REGEX "^DEFINE_TEST")
         FOREACH (deftest ${testvar})
           FILE(APPEND ${_listfile} "${deftest}\n")
         ENDFOREACH (deftest)
-      ENDIF (testfile MATCHES ".+/test_[^/]+[.]c$")
+      ENDIF (testfile MATCHES "^test_[^/]+[.]c$")
     ENDFOREACH (testfile)
 
   ENDIF (NOT EXISTS "${_listfile}" OR
@@ -522,115 +522,15 @@ IF(ENABLE_ACL)
 
 ENDIF(ENABLE_ACL)
 
-# Generate "config.h" from "cmake/config.h.in"
+# Generate "config.h" from "build/cmake/config.h.in"
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
        ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-############################################
 #
-# How to build libarchive
 #
-############################################
-SET(include_HEADERS
-  libarchive/archive.h
-  libarchive/archive_entry.h
-)
-
-SET(libarchive_SOURCES
-  libarchive/archive_check_magic.c
-  libarchive/archive_endian.h
-  libarchive/archive_entry.c
-  libarchive/archive_entry.h
-  libarchive/archive_entry_copy_stat.c
-  libarchive/archive_entry_link_resolver.c
-  libarchive/archive_entry_private.h
-  libarchive/archive_entry_stat.c
-  libarchive/archive_entry_strmode.c
-  libarchive/archive_platform.h
-  libarchive/archive_private.h
-  libarchive/archive_read.c
-  libarchive/archive_read_data_into_fd.c
-  libarchive/archive_read_disk.c
-  libarchive/archive_read_disk_entry_from_file.c
-  libarchive/archive_read_disk_private.h
-  libarchive/archive_read_disk_set_standard_lookup.c
-  libarchive/archive_read_extract.c
-  libarchive/archive_read_open_fd.c
-  libarchive/archive_read_open_file.c
-  libarchive/archive_read_open_filename.c
-  libarchive/archive_read_open_memory.c
-  libarchive/archive_read_private.h
-  libarchive/archive_read_support_compression_all.c
-  libarchive/archive_read_support_compression_bzip2.c
-  libarchive/archive_read_support_compression_compress.c
-  libarchive/archive_read_support_compression_gzip.c
-  libarchive/archive_read_support_compression_none.c
-  libarchive/archive_read_support_compression_program.c
-  libarchive/archive_read_support_compression_xz.c
-  libarchive/archive_read_support_format_all.c
-  libarchive/archive_read_support_format_ar.c
-  libarchive/archive_read_support_format_cpio.c
-  libarchive/archive_read_support_format_empty.c
-  libarchive/archive_read_support_format_iso9660.c
-  libarchive/archive_read_support_format_mtree.c
-  libarchive/archive_read_support_format_tar.c
-  libarchive/archive_read_support_format_zip.c
-  libarchive/archive_string.c
-  libarchive/archive_string.h
-  libarchive/archive_string_sprintf.c
-  libarchive/archive_util.c
-  libarchive/archive_virtual.c
-  libarchive/archive_write.c
-  libarchive/archive_write_disk.c
-  libarchive/archive_write_disk_private.h
-  libarchive/archive_write_disk_set_standard_lookup.c
-  libarchive/archive_write_private.h
-  libarchive/archive_write_open_fd.c
-  libarchive/archive_write_open_file.c
-  libarchive/archive_write_open_filename.c
-  libarchive/archive_write_open_memory.c
-  libarchive/archive_write_set_compression_bzip2.c
-  libarchive/archive_write_set_compression_compress.c
-  libarchive/archive_write_set_compression_gzip.c
-  libarchive/archive_write_set_compression_none.c
-  libarchive/archive_write_set_compression_program.c
-  libarchive/archive_write_set_compression_xz.c
-  libarchive/archive_write_set_format.c
-  libarchive/archive_write_set_format_ar.c
-  libarchive/archive_write_set_format_by_name.c
-  libarchive/archive_write_set_format_cpio.c
-  libarchive/archive_write_set_format_cpio_newc.c
-  libarchive/archive_write_set_format_mtree.c
-  libarchive/archive_write_set_format_pax.c
-  libarchive/archive_write_set_format_shar.c
-  libarchive/archive_write_set_format_ustar.c
-  libarchive/filter_fork.c
-  libarchive/filter_fork.h
-)
-
-SET(libarchive_MANS
-  libarchive/archive_entry.3
-  libarchive/archive_read.3
-  libarchive/archive_read_disk.3
-  libarchive/archive_util.3
-  libarchive/archive_write.3
-  libarchive/archive_write_disk.3
-  libarchive/cpio.5
-  libarchive/libarchive.3
-  libarchive/libarchive_internals.3
-  libarchive/libarchive-formats.5
-  libarchive/mtree.5
-  libarchive/tar.5
-)
-
-IF(WIN32)
-  LIST(APPEND libarchive_SOURCES libarchive/archive_windows.c)
-  LIST(APPEND libarchive_SOURCES libarchive/archive_windows.h)
-  LIST(APPEND libarchive_SOURCES libarchive/filter_fork_windows.c)
-ENDIF(WIN32)
-
+#
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libarchive)
 #
 IF(MSVC)
@@ -642,316 +542,8 @@ ENDIF(MSVC)
 IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
   ADD_DEFINITIONS(-Wall -Werror)
 ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-# Libarchive is a library
-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
-TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
-SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
-ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
-SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
-  LIBARCHIVE_STATIC)
-IF(NOT WIN32 OR CYGWIN)
-  SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
-ENDIF(NOT WIN32 OR CYGWIN)
-INSTALL(TARGETS archive archive_static
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib)
-INSTALL_MAN(${libarchive_MANS})
-INSTALL(FILES ${include_HEADERS} DESTINATION include)
-
-############################################
-#
-# How to build libarchive_test
-#
-############################################
-IF(ENABLE_TEST)
-  SET(libarchive_test_SOURCES
-    ${libarchive_SOURCES}
-    libarchive/test/main.c
-    libarchive/test/read_open_memory.c
-    libarchive/test/test.h
-    libarchive/test/test_acl_basic.c
-    libarchive/test/test_acl_freebsd.c
-    libarchive/test/test_acl_pax.c
-    libarchive/test/test_archive_api_feature.c
-    libarchive/test/test_bad_fd.c
-    libarchive/test/test_compat_bzip2.c
-    libarchive/test/test_compat_gtar.c
-    libarchive/test/test_compat_gzip.c
-    libarchive/test/test_compat_tar_hardlink.c
-    libarchive/test/test_compat_xz.c
-    libarchive/test/test_compat_zip.c
-    libarchive/test/test_empty_write.c
-    libarchive/test/test_entry.c
-    libarchive/test/test_entry_strmode.c
-    libarchive/test/test_extattr_freebsd.c
-    libarchive/test/test_fuzz.c
-    libarchive/test/test_link_resolver.c
-    libarchive/test/test_pax_filename_encoding.c
-    libarchive/test/test_read_compress_program.c
-    libarchive/test/test_read_data_large.c
-    libarchive/test/test_read_disk.c
-    libarchive/test/test_read_extract.c
-    libarchive/test/test_read_file_nonexistent.c
-    libarchive/test/test_read_format_ar.c
-    libarchive/test/test_read_format_cpio_bin.c
-    libarchive/test/test_read_format_cpio_bin_Z.c
-    libarchive/test/test_read_format_cpio_bin_bz2.c
-    libarchive/test/test_read_format_cpio_bin_gz.c
-    libarchive/test/test_read_format_cpio_bin_xz.c
-    libarchive/test/test_read_format_cpio_odc.c
-    libarchive/test/test_read_format_cpio_svr4_gzip.c
-    libarchive/test/test_read_format_cpio_svr4c_Z.c
-    libarchive/test/test_read_format_empty.c
-    libarchive/test/test_read_format_gtar_gz.c
-    libarchive/test/test_read_format_gtar_lzma.c
-    libarchive/test/test_read_format_gtar_sparse.c
-    libarchive/test/test_read_format_iso_gz.c
-    libarchive/test/test_read_format_isojoliet_bz2.c
-    libarchive/test/test_read_format_isorr_bz2.c
-    libarchive/test/test_read_format_mtree.c
-    libarchive/test/test_read_format_pax_bz2.c
-    libarchive/test/test_read_format_tar.c
-    libarchive/test/test_read_format_tar_empty_filename.c
-    libarchive/test/test_read_format_tbz.c
-    libarchive/test/test_read_format_tgz.c
-    libarchive/test/test_read_format_txz.c
-    libarchive/test/test_read_format_tz.c
-    libarchive/test/test_read_format_zip.c
-    libarchive/test/test_read_large.c
-    libarchive/test/test_read_pax_truncated.c
-    libarchive/test/test_read_position.c
-    libarchive/test/test_read_truncated.c
-    libarchive/test/test_tar_filenames.c
-    libarchive/test/test_tar_large.c
-    libarchive/test/test_ustar_filenames.c
-    libarchive/test/test_write_compress.c
-    libarchive/test/test_write_compress_program.c
-    libarchive/test/test_write_disk.c
-    libarchive/test/test_write_disk_failures.c
-    libarchive/test/test_write_disk_hardlink.c
-    libarchive/test/test_write_disk_perms.c
-    libarchive/test/test_write_disk_secure.c
-    libarchive/test/test_write_disk_sparse.c
-    libarchive/test/test_write_disk_times.c
-    libarchive/test/test_write_format_ar.c
-    libarchive/test/test_write_format_cpio.c
-    libarchive/test/test_write_format_cpio_empty.c
-    libarchive/test/test_write_format_cpio_odc.c
-    libarchive/test/test_write_format_cpio_newc.c
-    libarchive/test/test_write_format_mtree.c
-    libarchive/test/test_write_format_pax.c
-    libarchive/test/test_write_format_shar_empty.c
-    libarchive/test/test_write_format_tar.c
-    libarchive/test/test_write_format_tar_empty.c
-    libarchive/test/test_write_format_tar_ustar.c
-    libarchive/test/test_write_open_memory.c
-  )
-
-  #
-  # Generate the list.h
-  #
-  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/libarchive/test/list.h
-    ${libarchive_test_SOURCES})
-  ADD_EXECUTABLE(libarchive_test ${libarchive_test_SOURCES})
-  TARGET_LINK_LIBRARIES(libarchive_test ${ADDITIONAL_LIBS})
-  SET_PROPERTY(TARGET libarchive_test PROPERTY COMPILE_DEFINITIONS
-    LIBARCHIVE_STATIC)
-  SET_PROPERTY(TARGET libarchive_test APPEND PROPERTY COMPILE_DEFINITIONS
-    LIST_H="${CMAKE_CURRENT_BINARY_DIR}/libarchive/test/list.h")
-  ADD_TEST(libarchive_test libarchive_test
-    -r ${CMAKE_CURRENT_SOURCE_DIR}/libarchive/test)
-ENDIF(ENABLE_TEST)
-
-############################################
-#
-# How to build bsdtar
-#
-############################################
-IF (ENABLE_TAR)
-  SET(bsdtar_SOURCES
-    tar/bsdtar.c
-    tar/bsdtar.h
-    tar/bsdtar_platform.h
-    tar/cmdline.c
-    tar/getdate.c
-    tar/matching.c
-    tar/read.c
-    tar/siginfo.c
-    tar/subst.c
-    tar/tree.c
-    tar/tree.h
-    tar/util.c
-    tar/write.c
-  )
-  IF(WIN32)
-    LIST(APPEND bsdtar_SOURCES tar/bsdtar_windows.c)
-    LIST(APPEND bsdtar_SOURCES tar/bsdtar_windows.h)
-  ENDIF(WIN32)
-
-  SET(bsdtar_MANS tar/bsdtar.1)
-
-  #
-  # Register target
-  #
-  ADD_EXECUTABLE(bsdtar ${bsdtar_SOURCES} ${include_HEADERS})
-  IF(WIN32 AND NOT CYGWIN)
-    TARGET_LINK_LIBRARIES(bsdtar archive ${ADDITIONAL_LIBS})
-  ELSE(WIN32 AND NOT CYGWIN)
-    TARGET_LINK_LIBRARIES(bsdtar archive_static ${ADDITIONAL_LIBS})
-  ENDIF(WIN32 AND NOT CYGWIN)
-  INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdtar_MANS})
-ENDIF(ENABLE_TAR)
-
-############################################
-#
-# How to build bsdtar_test
-#
-############################################
-IF(ENABLE_TAR AND ENABLE_TEST)
-  SET(bsdtar_test_SOURCES
-    tar/getdate.c
-    tar/test/main.c
-    tar/test/test.h
-    tar/test/test_0.c
-    tar/test/test_basic.c
-    tar/test/test_copy.c
-    tar/test/test_getdate.c
-    tar/test/test_help.c
-    tar/test/test_option_T.c
-    tar/test/test_option_q.c
-    tar/test/test_option_s.c
-    tar/test/test_patterns.c
-    tar/test/test_stdio.c
-    tar/test/test_strip_components.c
-    tar/test/test_symlink_dir.c
-    tar/test/test_version.c
-  )
-  IF(WIN32)
-    LIST(APPEND bsdtar_test_SOURCES tar/bsdtar_windows.c)
-    LIST(APPEND bsdtar_test_SOURCES tar/bsdtar_windows.h)
-    LIST(APPEND bsdtar_test_SOURCES tar/test/test_windows.c)
-  ENDIF(WIN32)
-
-  #
-  # Generate the list.h
-  #
-  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/tar/test/list.h
-    ${bsdtar_test_SOURCES})
-  #
-  # Register target
-  #
-  ADD_EXECUTABLE(bsdtar_test ${bsdtar_test_SOURCES})
-  SET_PROPERTY(TARGET bsdtar_test PROPERTY COMPILE_DEFINITIONS
-    LIST_H="${CMAKE_CURRENT_BINARY_DIR}/tar/test/list.h")
-  IF(WIN32)
-    ADD_TEST(bsdtar_test bsdtar_test
-      -v
-      -p ${CMAKE_CURRENT_BINARY_DIR}/debug/bsdtar.exe
-      -r ${CMAKE_CURRENT_SOURCE_DIR}/tar/test)
-  ELSE(WIN32)
-    ADD_TEST(bsdtar_test bsdtar_test
-      -v
-      -p ${CMAKE_CURRENT_BINARY_DIR}/bsdtar
-      -r ${CMAKE_CURRENT_SOURCE_DIR}/tar/test)
-  ENDIF(WIN32)
-
-ENDIF (ENABLE_TAR AND ENABLE_TEST)
-
-############################################
-#
-# How to build bsdcpio
-#
-############################################
-IF(ENABLE_CPIO)
-  SET(bsdcpio_SOURCES
-    cpio/cmdline.c
-    cpio/cpio.c
-    cpio/cpio.h
-    cpio/cpio_platform.h
-    cpio/err.c
-    cpio/matching.c
-    cpio/matching.h
-    cpio/pathmatch.c
-    cpio/pathmatch.h
-  )
-  IF(WIN32)
-    LIST(APPEND bsdcpio_SOURCES cpio/cpio_windows.c)
-    LIST(APPEND bsdcpio_SOURCES cpio/cpio_windows.h)
-  ENDIF(WIN32)
-
-  SET(bsdcpio_MANS cpio/bsdcpio.1)
-
-  #
-  # Register target
-  #
-  ADD_EXECUTABLE(bsdcpio ${bsdcpio_SOURCES} ${include_HEADERS})
-  IF(WIN32 AND NOT CYGWIN)
-    TARGET_LINK_LIBRARIES(bsdcpio archive ${ADDITIONAL_LIBS})
-  ELSE(WIN32 AND NOT CYGWIN)
-    TARGET_LINK_LIBRARIES(bsdcpio archive_static ${ADDITIONAL_LIBS})
-  ENDIF(WIN32 AND NOT CYGWIN)
-  INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
-  INSTALL_MAN(${bsdcpio_MANS})
-ENDIF(ENABLE_CPIO)
-
-############################################
-#
-# How to build bsdcpio_test
-#
-############################################
-IF(ENABLE_CPIO AND ENABLE_TEST)
-  SET(bsdcpio_test_SOURCES
-    cpio/cmdline.c
-    cpio/err.c
-    cpio/pathmatch.c
-    cpio/test/main.c
-    cpio/test/test.h
-    cpio/test/test_0.c
-    cpio/test/test_basic.c
-    cpio/test/test_format_newc.c
-    cpio/test/test_gcpio_compat.c
-    cpio/test/test_option_B.c
-    cpio/test/test_option_L.c
-    cpio/test/test_option_a.c
-    cpio/test/test_option_c.c
-    cpio/test/test_option_d.c
-    cpio/test/test_option_ell.c
-    cpio/test/test_option_f.c
-    cpio/test/test_option_help.c
-    cpio/test/test_option_m.c
-    cpio/test/test_option_t.c
-    cpio/test/test_option_u.c
-    cpio/test/test_option_version.c
-    cpio/test/test_option_y.c
-    cpio/test/test_option_z.c
-    cpio/test/test_owner_parse.c
-    cpio/test/test_passthrough_dotdot.c
-    cpio/test/test_passthrough_reverse.c
-    cpio/test/test_pathmatch.c
-  )
-  IF(WIN32)
-    LIST(APPEND bsdcpio_test_SOURCES cpio/cpio_windows.c)
-    LIST(APPEND bsdcpio_test_SOURCES cpio/cpio_windows.h)
-  ENDIF(WIN32)
-
-  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/cpio/test/list.h
-    ${bsdcpio_test_SOURCES})
-  ADD_EXECUTABLE(bsdcpio_test ${bsdcpio_test_SOURCES})
-  SET_PROPERTY(TARGET bsdcpio_test PROPERTY COMPILE_DEFINITIONS
-    LIST_H="${CMAKE_CURRENT_BINARY_DIR}/cpio/test/list.h")
-  IF(WIN32)
-    ADD_TEST(bsdcpio_test bsdcpio_test
-     -v
-     -p ${CMAKE_CURRENT_BINARY_DIR}/debug/bsdcpio.exe
-     -r ${CMAKE_CURRENT_SOURCE_DIR}/cpio/test)
-  ELSE(WIN32)
-    ADD_TEST(bsdcpio_test bsdcpio_test
-     -v
-     -p ${CMAKE_CURRENT_BINARY_DIR}/bsdcpio
-     -r ${CMAKE_CURRENT_SOURCE_DIR}/cpio/test)
-  ENDIF(WIN32)
 
-ENDIF(ENABLE_CPIO AND ENABLE_TEST)
+add_subdirectory(libarchive)
+add_subdirectory(tar)
+add_subdirectory(cpio)
 

diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt
new file mode 100644 (file)
index 0000000..05125c2
--- /dev/null
+++ b/cpio/CMakeLists.txt
@@ -0,0 +1,42 @@
+############################################
+#
+# How to build bsdcpio
+#
+############################################
+IF(ENABLE_CPIO)
+  SET(bsdcpio_SOURCES
+    cmdline.c
+    cpio.c
+    cpio.h
+    cpio_platform.h
+    err.c
+    matching.c
+    matching.h
+    pathmatch.c
+    pathmatch.h
+  )
+  IF(WIN32 AND NOT CYGWIN)
+    LIST(APPEND bsdcpio_SOURCES cpio_windows.c)
+    LIST(APPEND bsdcpio_SOURCES cpio_windows.h)
+  ENDIF(WIN32 AND NOT CYGWIN)
+
+  SET(bsdcpio_MANS bsdcpio.1)
+
+  #
+  # Register target
+  #
+  ADD_EXECUTABLE(bsdcpio ${bsdcpio_SOURCES})
+  IF(WIN32 AND NOT CYGWIN)
+    TARGET_LINK_LIBRARIES(bsdcpio archive ${ADDITIONAL_LIBS})
+    SET_TARGET_PROPERTIES(bsdcpio PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+    SET(BSDCPIO ${CMAKE_BINARY_DIR}/debug/bsdcpio.exe)
+  ELSE(WIN32 AND NOT CYGWIN)
+    TARGET_LINK_LIBRARIES(bsdcpio archive_static ${ADDITIONAL_LIBS})
+    SET(BSDCPIO ${CMAKE_CURRENT_BINARY_DIR}/bsdcpio)
+  ENDIF(WIN32 AND NOT CYGWIN)
+  INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
+  INSTALL_MAN(${bsdcpio_MANS})
+ENDIF(ENABLE_CPIO)
+
+add_subdirectory(test)

diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b984b10
--- /dev/null
+++ b/cpio/test/CMakeLists.txt
@@ -0,0 +1,58 @@
+############################################
+#
+# How to build bsdcpio_test
+#
+############################################
+IF(ENABLE_CPIO AND ENABLE_TEST)
+  SET(bsdcpio_test_SOURCES
+    ../cmdline.c
+    ../err.c
+    ../pathmatch.c
+    main.c
+    test.h
+    test_0.c
+    test_basic.c
+    test_format_newc.c
+    test_gcpio_compat.c
+    test_option_B.c
+    test_option_L.c
+    test_option_a.c
+    test_option_c.c
+    test_option_d.c
+    test_option_ell.c
+    test_option_f.c
+    test_option_help.c
+    test_option_m.c
+    test_option_t.c
+    test_option_u.c
+    test_option_version.c
+    test_option_y.c
+    test_option_z.c
+    test_owner_parse.c
+    test_passthrough_dotdot.c
+    test_passthrough_reverse.c
+    test_pathmatch.c
+  )
+  IF(WIN32 AND NOT CYGWIN)
+    LIST(APPEND bsdcpio_test_SOURCES ../cpio_windows.c)
+    LIST(APPEND bsdcpio_test_SOURCES ../cpio_windows.h)
+  ENDIF(WIN32 AND NOT CYGWIN)
+
+  #
+  # Generate the list.h
+  #
+  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/list.h
+    ${bsdcpio_test_SOURCES})
+  SET_PROPERTY(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_BINARY_DIR})
+  #
+  # Register target
+  #
+  ADD_EXECUTABLE(bsdcpio_test ${bsdcpio_test_SOURCES})
+  SET_PROPERTY(TARGET bsdcpio_test PROPERTY COMPILE_DEFINITIONS LIST_H)
+  ADD_TEST(bsdcpio_test bsdcpio_test
+   -v
+   -p ${BSDCPIO}
+   -r ${CMAKE_CURRENT_SOURCE_DIR})
+ENDIF(ENABLE_CPIO AND ENABLE_TEST)
+

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 8d10206b976494d116f829d8db6e02b283a347f5..3563f007ec4dd6c9bfe703579432212271fcb5a6 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -56,11 +56,7 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/test/main.c,v 1.3 2008/08/24 04:58:22 kient
  */
 #undef DEFINE_TEST
 #define        DEFINE_TEST(name) void name(void);
-#ifdef LIST_H
-#include LIST_H
-#else
 #include "list.h"
-#endif
 
 /* Interix doesn't define these in a standard header. */
 #if __INTERIX__
@@ -764,11 +760,7 @@ slurpfile(size_t * sizep, const char *fmt, ...)
 #undef DEFINE_TEST
 #define        DEFINE_TEST(n) { n, #n },
 struct { void (*func)(void); const char *name; } tests[] = {
-#ifdef LIST_H
-       #include LIST_H
-#else
        #include "list.h"
-#endif
 };
 
 /*

diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0c2eee1
--- /dev/null
+++ b/libarchive/CMakeLists.txt
@@ -0,0 +1,130 @@
+
+############################################
+#
+# How to build libarchive
+#
+############################################
+SET(include_HEADERS
+  archive.h
+  archive_entry.h
+)
+
+SET(libarchive_SOURCES
+  archive_check_magic.c
+  archive_endian.h
+  archive_entry.c
+  archive_entry.h
+  archive_entry_copy_stat.c
+  archive_entry_link_resolver.c
+  archive_entry_private.h
+  archive_entry_stat.c
+  archive_entry_strmode.c
+  archive_platform.h
+  archive_private.h
+  archive_read.c
+  archive_read_data_into_fd.c
+  archive_read_disk.c
+  archive_read_disk_entry_from_file.c
+  archive_read_disk_private.h
+  archive_read_disk_set_standard_lookup.c
+  archive_read_extract.c
+  archive_read_open_fd.c
+  archive_read_open_file.c
+  archive_read_open_filename.c
+  archive_read_open_memory.c
+  archive_read_private.h
+  archive_read_support_compression_all.c
+  archive_read_support_compression_bzip2.c
+  archive_read_support_compression_compress.c
+  archive_read_support_compression_gzip.c
+  archive_read_support_compression_none.c
+  archive_read_support_compression_program.c
+  archive_read_support_compression_xz.c
+  archive_read_support_format_all.c
+  archive_read_support_format_ar.c
+  archive_read_support_format_cpio.c
+  archive_read_support_format_empty.c
+  archive_read_support_format_iso9660.c
+  archive_read_support_format_mtree.c
+  archive_read_support_format_tar.c
+  archive_read_support_format_zip.c
+  archive_string.c
+  archive_string.h
+  archive_string_sprintf.c
+  archive_util.c
+  archive_virtual.c
+  archive_write.c
+  archive_write_disk.c
+  archive_write_disk_private.h
+  archive_write_disk_set_standard_lookup.c
+  archive_write_private.h
+  archive_write_open_fd.c
+  archive_write_open_file.c
+  archive_write_open_filename.c
+  archive_write_open_memory.c
+  archive_write_set_compression_bzip2.c
+  archive_write_set_compression_compress.c
+  archive_write_set_compression_gzip.c
+  archive_write_set_compression_none.c
+  archive_write_set_compression_program.c
+  archive_write_set_compression_xz.c
+  archive_write_set_format.c
+  archive_write_set_format_ar.c
+  archive_write_set_format_by_name.c
+  archive_write_set_format_cpio.c
+  archive_write_set_format_cpio_newc.c
+  archive_write_set_format_mtree.c
+  archive_write_set_format_pax.c
+  archive_write_set_format_shar.c
+  archive_write_set_format_ustar.c
+  filter_fork.c
+  filter_fork.h
+)
+
+SET(libarchive_MANS
+  archive_entry.3
+  archive_read.3
+  archive_read_disk.3
+  archive_util.3
+  archive_write.3
+  archive_write_disk.3
+  cpio.5
+  libarchive.3
+  libarchive_internals.3
+  libarchive-formats.5
+  mtree.5
+  tar.5
+)
+
+IF(WIN32 AND NOT CYGWIN)
+  LIST(APPEND libarchive_SOURCES archive_windows.c)
+  LIST(APPEND libarchive_SOURCES archive_windows.h)
+  LIST(APPEND libarchive_SOURCES filter_fork_windows.c)
+ENDIF(WIN32 AND NOT CYGWIN)
+
+
+#
+# Register target
+#
+# Libarchive is a library
+ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
+TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
+SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
+SET_TARGET_PROPERTIES(archive PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
+SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
+  LIBARCHIVE_STATIC)
+SET_TARGET_PROPERTIES(archive_static PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+IF(NOT WIN32 OR CYGWIN)
+  SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
+ENDIF(NOT WIN32 OR CYGWIN)
+INSTALL(TARGETS archive archive_static
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
+INSTALL_MAN(${libarchive_MANS})
+INSTALL(FILES ${include_HEADERS} DESTINATION include)
+
+add_subdirectory(test)

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f454a42
--- /dev/null
+++ b/libarchive/test/CMakeLists.txt
@@ -0,0 +1,111 @@
+############################################
+#
+# How to build libarchive_test
+#
+############################################
+IF(ENABLE_TEST)
+  FOREACH (_src ${libarchive_SOURCES})
+    LIST(APPEND parent_libarchive_SOURCES "../${_src}")
+  ENDFOREACH(_src)
+
+  SET(libarchive_test_SOURCES
+    ${parent_libarchive_SOURCES}
+    main.c
+    read_open_memory.c
+    test.h
+    test_acl_basic.c
+    test_acl_freebsd.c
+    test_acl_pax.c
+    test_archive_api_feature.c
+    test_bad_fd.c
+    test_compat_bzip2.c
+    test_compat_gtar.c
+    test_compat_gzip.c
+    test_compat_tar_hardlink.c
+    test_compat_xz.c
+    test_compat_zip.c
+    test_empty_write.c
+    test_entry.c
+    test_entry_strmode.c
+    test_extattr_freebsd.c
+    test_fuzz.c
+    test_link_resolver.c
+    test_pax_filename_encoding.c
+    test_read_compress_program.c
+    test_read_data_large.c
+    test_read_disk.c
+    test_read_extract.c
+    test_read_file_nonexistent.c
+    test_read_format_ar.c
+    test_read_format_cpio_bin.c
+    test_read_format_cpio_bin_Z.c
+    test_read_format_cpio_bin_bz2.c
+    test_read_format_cpio_bin_gz.c
+    test_read_format_cpio_bin_xz.c
+    test_read_format_cpio_odc.c
+    test_read_format_cpio_svr4_gzip.c
+    test_read_format_cpio_svr4c_Z.c
+    test_read_format_empty.c
+    test_read_format_gtar_gz.c
+    test_read_format_gtar_lzma.c
+    test_read_format_gtar_sparse.c
+    test_read_format_iso_gz.c
+    test_read_format_isojoliet_bz2.c
+    test_read_format_isorr_bz2.c
+    test_read_format_mtree.c
+    test_read_format_pax_bz2.c
+    test_read_format_tar.c
+    test_read_format_tar_empty_filename.c
+    test_read_format_tbz.c
+    test_read_format_tgz.c
+    test_read_format_txz.c
+    test_read_format_tz.c
+    test_read_format_zip.c
+    test_read_large.c
+    test_read_pax_truncated.c
+    test_read_position.c
+    test_read_truncated.c
+    test_tar_filenames.c
+    test_tar_large.c
+    test_ustar_filenames.c
+    test_write_compress.c
+    test_write_compress_program.c
+    test_write_disk.c
+    test_write_disk_failures.c
+    test_write_disk_hardlink.c
+    test_write_disk_perms.c
+    test_write_disk_secure.c
+    test_write_disk_sparse.c
+    test_write_disk_times.c
+    test_write_format_ar.c
+    test_write_format_cpio.c
+    test_write_format_cpio_empty.c
+    test_write_format_cpio_odc.c
+    test_write_format_cpio_newc.c
+    test_write_format_mtree.c
+    test_write_format_pax.c
+    test_write_format_shar_empty.c
+    test_write_format_tar.c
+    test_write_format_tar_empty.c
+    test_write_format_tar_ustar.c
+    test_write_open_memory.c
+  )
+
+  #
+  # Generate the list.h
+  #
+  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/list.h
+    ${libarchive_test_SOURCES})
+  SET_PROPERTY(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_BINARY_DIR})
+  #
+  # Register target
+  #
+  ADD_EXECUTABLE(libarchive_test ${libarchive_test_SOURCES})
+  TARGET_LINK_LIBRARIES(libarchive_test ${ADDITIONAL_LIBS})
+  SET_PROPERTY(TARGET libarchive_test PROPERTY COMPILE_DEFINITIONS
+    LIBARCHIVE_STATIC LIST_H)
+  ADD_TEST(libarchive_test libarchive_test
+    -r ${CMAKE_CURRENT_SOURCE_DIR})
+ENDIF(ENABLE_TEST)
+

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index e351d5059aa98297a78a0f95dc93bd93e191cbf5..b6f84b09a1fa08bc604abe07e932b72a92658502 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -62,11 +62,7 @@ __FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.17 2008/12/21 00:13:50 ki
  */
 #undef DEFINE_TEST
 #define        DEFINE_TEST(name) void name(void);
-#ifdef LIST_H
-#include LIST_H
-#else
 #include "list.h"
-#endif
 
 /* Interix doesn't define these in a standard header. */
 #if __INTERIX__
@@ -722,11 +718,7 @@ slurpfile(size_t * sizep, const char *fmt, ...)
 #undef DEFINE_TEST
 #define        DEFINE_TEST(n) { n, #n },
 struct { void (*func)(void); const char *name; } tests[] = {
-#ifdef LIST_H
-       #include LIST_H
-#else
        #include "list.h"
-#endif
 };
 
 static void

diff --git a/tar/CMakeLists.txt b/tar/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dc60b39
--- /dev/null
+++ b/tar/CMakeLists.txt
@@ -0,0 +1,46 @@
+############################################
+#
+# How to build bsdtar
+#
+############################################
+IF (ENABLE_TAR)
+  SET(bsdtar_SOURCES
+    bsdtar.c
+    bsdtar.h
+    bsdtar_platform.h
+    cmdline.c
+    getdate.c
+    matching.c
+    read.c
+    siginfo.c
+    subst.c
+    tree.c
+    tree.h
+    util.c
+    write.c
+  )
+  IF(WIN32 AND NOT CYGWIN)
+    LIST(APPEND bsdtar_SOURCES bsdtar_windows.c)
+    LIST(APPEND bsdtar_SOURCES bsdtar_windows.h)
+  ENDIF(WIN32 AND NOT CYGWIN)
+
+  SET(bsdtar_MANS bsdtar.1)
+
+  #
+  # Register target
+  #
+  ADD_EXECUTABLE(bsdtar ${bsdtar_SOURCES})
+  IF(WIN32 AND NOT CYGWIN)
+    TARGET_LINK_LIBRARIES(bsdtar archive ${ADDITIONAL_LIBS})
+    SET_TARGET_PROPERTIES(bsdtar PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+    SET(BSDTAR ${CMAKE_BINARY_DIR}/debug/bsdtar.exe)
+  ELSE(WIN32 AND NOT CYGWIN)
+    TARGET_LINK_LIBRARIES(bsdtar archive_static ${ADDITIONAL_LIBS})
+    SET(BSDTAR ${CMAKE_CURRENT_BINARY_DIR}/bsdtar)
+  ENDIF(WIN32 AND NOT CYGWIN)
+  INSTALL(TARGETS bsdtar RUNTIME DESTINATION bin)
+  INSTALL_MAN(${bsdtar_MANS})
+ENDIF(ENABLE_TAR)
+
+add_subdirectory(test)

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7395042
--- /dev/null
+++ b/tar/test/CMakeLists.txt
@@ -0,0 +1,47 @@
+############################################
+#
+# How to build bsdtar_test
+#
+############################################
+IF(ENABLE_TAR AND ENABLE_TEST)
+  SET(bsdtar_test_SOURCES
+    ../getdate.c
+    main.c
+    test.h
+    test_0.c
+    test_basic.c
+    test_copy.c
+    test_getdate.c
+    test_help.c
+    test_option_T.c
+    test_option_q.c
+    test_option_s.c
+    test_patterns.c
+    test_stdio.c
+    test_strip_components.c
+    test_symlink_dir.c
+    test_version.c
+  )
+  IF(WIN32 AND NOT CYGWIN)
+    LIST(APPEND bsdtar_test_SOURCES ../bsdtar_windows.c)
+    LIST(APPEND bsdtar_test_SOURCES ../bsdtar_windows.h)
+    LIST(APPEND bsdtar_test_SOURCES test_windows.c)
+  ENDIF(WIN32 AND NOT CYGWIN)
+
+  #
+  # Generate the list.h
+  #
+  GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/list.h
+    ${bsdtar_test_SOURCES})
+  SET_PROPERTY(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_BINARY_DIR})
+  #
+  # Register target
+  #
+  ADD_EXECUTABLE(bsdtar_test ${bsdtar_test_SOURCES})
+  SET_PROPERTY(TARGET bsdtar_test PROPERTY COMPILE_DEFINITIONS LIST_H)
+  ADD_TEST(bsdtar_test bsdtar_test
+    -v
+    -p ${BSDTAR}
+    -r ${CMAKE_CURRENT_SOURCE_DIR})
+ENDIF (ENABLE_TAR AND ENABLE_TEST)

diff --git a/tar/test/main.c b/tar/test/main.c
index c30da097707b4b14b4bc49a43ced588c0d511d63..fd279955c09221fa8fe9cb7a137856f96dddb5bf 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -56,11 +56,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/test/main.c,v 1.6 2008/11/05 06:40:53 kientz
  */
 #undef DEFINE_TEST
 #define        DEFINE_TEST(name) void name(void);
-#ifdef LIST_H
-#include LIST_H
-#else
 #include "list.h"
-#endif
 
 /* Interix doesn't define these in a standard header. */
 #if __INTERIX__
@@ -754,11 +750,7 @@ slurpfile(size_t * sizep, const char *fmt, ...)
 #undef DEFINE_TEST
 #define        DEFINE_TEST(n) { n, #n },
 struct { void (*func)(void); const char *name; } tests[] = {
-#ifdef LIST_H
-       #include LIST_H
-#else
        #include "list.h"
-#endif
 };
 
 /*