make subdir libs&bins to depend on toplevel libzzip via cmake targets

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e70b42664f61e074ca6e28fd8825943ea04a610e..4089d03eaba6b94f787ee98827f1858e92d9cb66 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ include ( CheckTypeSize )
 include ( TestBigEndian )
 include ( GNUInstallDirs )
 
+# options ###########################################################
 option(BUILD_SHARED_LIBS "Build a shared library" ON)
 option(BUILD_STATIC_LIBS "Build the static library" OFF)
 option(BUILD_TESTS "Build test programs" OFF)
@@ -68,8 +69,6 @@ test_big_endian ( ZZIP_WORDS_BIGENDIAN )
 
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/zzip/_config.h )
 
-# options ###########################################################
-
 # Zlib library needed
 find_package ( ZLIB REQUIRED )
 

diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
index ce0d187cfcc04c8886db403b3d7fe658f8eb06bf..01ee83e037c214cb64f2498a3d33b8006087906e 100644 (file)
--- a/SDL/CMakeLists.txt
+++ b/SDL/CMakeLists.txt
@@ -12,6 +12,7 @@ MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
 include ( GNUInstallDirs )
 include ( FindPkgConfig )
 
+# options ########################################################
 option(BUILD_SHARED_LIBS "Build a shared library" ON)
 option(BUILD_STATIC_LIBS "Build the static library" OFF)
 option(BUILD_TESTS "Build test programs" OFF)
@@ -19,16 +20,9 @@ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
 
 # Zlib library needed
 find_package ( ZLIB REQUIRED )
-pkg_search_module ( ZZIP zzip )
+# pkg_search_module ( ZZIP zzip )
 pkg_search_module ( SDL sdl2)
 
-# use the uninstalled zzip here (don't know to to tell pkg_search_module)
-set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-get_target_property(libname libzzip OUTPUT_NAME)
-set(ZZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
-set(ZZIP_LIBRARY ${CMAKE_BINARY_DIR}/${lib}${libname}${dll})
-
 # targets ########################################################
 set(ZZIPSDL_SRCS 
     SDL_rwops_zzip.c)
@@ -42,7 +36,7 @@ set(ZZCATSDL_SRCS
 
 if(SDL_FOUND)
 add_executable(zzcatsdl ${ZZCATSDL_SRCS} )
-target_link_libraries(zzcatsdl "${ZZIP_LIBRARY}" "${SDL_LIBRARIES}" ZLIB::ZLIB)
+target_link_libraries(zzcatsdl libzzip "${SDL_LIBRARIES}" ZLIB::ZLIB)
 target_include_directories(zzcatsdl PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${SDL_INCLUDE_DIRS}")
 endif()
 

diff --git a/bins/CMakeLists.txt b/bins/CMakeLists.txt
index 8e37ac7d93aaf7f80574439d2b88794123838d87..661180261f839a9a39ec6fbaf981eb32320ed76a 100644 (file)
--- a/bins/CMakeLists.txt
+++ b/bins/CMakeLists.txt
@@ -12,6 +12,7 @@ MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
 include ( GNUInstallDirs )
 include ( FindPkgConfig )
 
+# options ########################################################
 option(BUILD_SHARED_LIBS "Build a shared library" ON)
 option(BUILD_STATIC_LIBS "Build the static library" OFF)
 option(BUILD_TESTS "Build test programs" OFF)
@@ -19,56 +20,45 @@ option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
 
 # Zlib library needed
 find_package ( ZLIB REQUIRED )
-pkg_search_module ( ZZIP zzip )
-pkg_search_module ( ZZIPMAPPED zzipmmapped )
-pkg_search_module ( ZZIPFSEEKO zzipfseeko )
-
-# use the uninstalled zzip here (don't know to to tell pkg_search_module)
-set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-get_target_property(libzzip libzzip OUTPUT_NAME)
-get_target_property(libzzipmapped libzzipmmapped OUTPUT_NAME)
-get_target_property(libzzipfseeko libzzipfseeko OUTPUT_NAME)
-set(ZZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
-set(ZZIP_LIBRARY ${CMAKE_BINARY_DIR}/${lib}${libzzip}${dll})
-set(ZZIPMAPPED_LIBRARY ${CMAKE_BINARY_DIR}/${lib}${libzzipmapped}${dll})
-set(ZZIPFSEEKO_LIBRARY ${CMAKE_BINARY_DIR}/${lib}${libzzipfseeko}${dll})
+# pkg_search_module ( ZZIP zzip )
+# pkg_search_module ( ZZIPMAPPED zzipmmapped )
+# pkg_search_module ( ZZIPFSEEKO zzipfseeko )
 
 # targets ########################################################
-add_executable(zzcat zzcat.c)
-add_executable(zzdir zzdir.c)
-add_executable(zzxorcat zzxorcat.c)
-add_executable(zzxordir zzxordir.c)
+add_executable(zzcat      zzcat.c)
+add_executable(zzdir      zzdir.c)
+add_executable(zzxorcat   zzxorcat.c)
+add_executable(zzxordir   zzxordir.c)
 add_executable(zzobfuscated zzobfuscated.c)
-add_executable(zziptest zziptest.c)
-add_executable(zzip zzip.c zzipmake-zip.c)
-add_executable(unzzip unzzip.c unzzipcat-zip.c unzzipdir-zip.c)
+add_executable(zziptest   zziptest.c)
+add_executable(zzip       zzip.c zzipmake-zip.c)
+add_executable(unzzip     unzzip.c unzzipcat-zip.c unzzipdir-zip.c)
 add_executable(unzzip-mix unzzip.c unzzipcat-mix.c unzzipdir-mix.c)
 add_executable(unzzip-mem unzzip.c unzzipcat-mem.c unzzipdir-mem.c)
 add_executable(unzzip-big unzzip.c unzzipcat-big.c unzzipdir-big.c)
 
-target_link_libraries(zzcat     "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zzdir      "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zzxorcat   "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zzxordir   "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zzobfuscated "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zziptest       "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(zzip       "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(unzzip     "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(unzzip-mix "${ZZIP_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(unzzip-mem "${ZZIPMAPPED_LIBRARY}" ZLIB::ZLIB)
-target_link_libraries(unzzip-big "${ZZIPFSEEKO_LIBRARY}" ZLIB::ZLIB)
+target_link_libraries(zzcat        libzzip        ZLIB::ZLIB)
+target_link_libraries(zzdir        libzzip        ZLIB::ZLIB)
+target_link_libraries(zzxorcat     libzzip        ZLIB::ZLIB)
+target_link_libraries(zzxordir     libzzip        ZLIB::ZLIB)
+target_link_libraries(zzobfuscated libzzip        ZLIB::ZLIB)
+target_link_libraries(zziptest     libzzip        ZLIB::ZLIB)
+target_link_libraries(zzip         libzzip        ZLIB::ZLIB)
+target_link_libraries(unzzip       libzzip        ZLIB::ZLIB)
+target_link_libraries(unzzip-mix   libzzip        ZLIB::ZLIB)
+target_link_libraries(unzzip-mem   libzzipmmapped ZLIB::ZLIB)
+target_link_libraries(unzzip-big   libzzipfseeko  ZLIB::ZLIB)
 
-target_include_directories(zzcat     PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(zzdir      PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(zzxorcat   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(zzxordir   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(zzcat        PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(zzdir        PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(zzxorcat     PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(zzxordir     PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 target_include_directories(zzobfuscated PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(zzip       PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(unzzip     PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(unzzip-mix PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(unzzip-mem PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories(unzzip-big PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(zzip         PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(unzzip       PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(unzzip-mix   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(unzzip-mem   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(unzzip-big   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # install ########################################################
 install(TARGETS zzcat zzdir zzxorcat zzxordir 

diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
index bd19cdf956bd0019ed82d24fefee1c6c98b899e7..97810ee3f9d661f3fb2297e45148d92065cc1e3e 100644 (file)
--- a/zzipwrap/CMakeLists.txt
+++ b/zzipwrap/CMakeLists.txt
@@ -13,6 +13,7 @@ include ( CheckIncludeFiles )
 include ( GNUInstallDirs )
 include ( FindPkgConfig )
 
+# options ########################################################
 option(BUILD_SHARED_LIBS "Build a shared library" ON)
 option(BUILD_STATIC_LIBS "Build the static library" OFF)
 option(BUILD_TESTS "Build test programs" OFF)
@@ -25,13 +26,6 @@ check_include_files ( unistd.h ZZIP_HAVE_UNISTD_H )
 find_package ( ZLIB REQUIRED )
 pkg_search_module ( ZZIP zzip )
 
-# use the uninstalled zzip here (don't know to to tell pkg_search_module)
-set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
-set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
-get_target_property(libname libzzip OUTPUT_NAME)
-set(ZZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
-set(ZZIP_LIBRARY ${CMAKE_BINARY_DIR}/${lib}${libname}${dll})
-
 # targets ########################################################
 set(ZZIPWRAP_SRCS
     zzipwrap.c)
@@ -43,7 +37,7 @@ set(LIBZZIPWRAP_HDRS
     wrap.h)
 
 add_library(libzzipwrap ${LIBZZIPWRAP_SRCS} )
-target_link_libraries(libzzipwrap "${ZZIP_LIBRARY}" ZLIB::ZLIB )
+target_link_libraries(libzzipwrap libzzip ZLIB::ZLIB )
 target_include_directories (libzzipwrap PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${ZZIP_INCLUDE_DIR})
 
 set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap-${RELNUM}")