Merge pull request #84 from ctabin/fix-libzip-travis

Fixes libzip version in Travis CI

.travis.yml

@@ -13,10 +13,10 @@ addons:
       - valgrind
 
 env:
-  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Debug BUILD_SHARED_LIBS=OFF
-  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Release BUILD_SHARED_LIBS=OFF
-  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Debug BUILD_SHARED_LIBS=ON
-  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Release BUILD_SHARED_LIBS=ON
+  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Debug LIBZIPPP_BUILD_SHARED_LIBS=OFF
+  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Release LIBZIPPP_BUILD_SHARED_LIBS=OFF
+  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Debug LIBZIPPP_BUILD_SHARED_LIBS=ON
+  - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" BUILD_TYPE=Release LIBZIPPP_BUILD_SHARED_LIBS=ON
 
 jobs:
   include:
@@ -42,7 +42,7 @@ install:
     make -j3 install
   - |
     mkdir -p $THIRD_PARTY/libzip && cd $THIRD_PARTY/libzip
-    travis_retry wget -O libzip.tar.gz "https://github.com/nih-at/libzip/archive/rel-1-6-1.tar.gz"
+    travis_retry wget -O libzip.tar.gz "https://github.com/nih-at/libzip/archive/v1.7.3.tar.gz"
     tar xzf libzip.tar.gz --strip-components=1
     mkdir build && cd build
     cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${THIRD_PARTY_PREFIX} -DCMAKE_INSTALL_PREFIX=${THIRD_PARTY_PREFIX} -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF
@@ -51,7 +51,7 @@ install:
 
 script:
   - mkdir build && cd build
-  - cmake .. -DCMAKE_PREFIX_PATH=${THIRD_PARTY_PREFIX} -DCMAKE_INSTALL_PREFIX=$HOME/libzippp -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS
+  - cmake .. -DCMAKE_PREFIX_PATH=${THIRD_PARTY_PREFIX} -DCMAKE_INSTALL_PREFIX=$HOME/libzippp -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=$LIBZIPPP_BUILD_SHARED_LIBS
   - make -j3 install
   - make test
   - rm -r *

CMakeLists.txt

@@ -5,9 +5,9 @@ project(libzippp VERSION 3.0.0)
 # Do not install or build tests by default when this file is included
 # as a sub-project (via add_subdirectory)
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    set(is_root_project ON)
+  set(is_root_project ON)
 else()
-    set(is_root_project OFF)
+  set(is_root_project OFF)
 endif()
 
 option(LIBZIPPP_INSTALL "Install library" ${is_root_project})
@@ -26,7 +26,7 @@ target_include_directories(libzippp
     $<INSTALL_INTERFACE:include/libzippp>
 )
 set_target_properties(libzippp PROPERTIES PREFIX "") # Avoid duplicate "lib" prefix
-target_link_libraries(libzippp PRIVATE libzip::libzip)
+target_link_libraries(libzippp PRIVATE libzip::zip)
 if (BUILD_SHARED_LIBS)
   target_compile_definitions(libzippp PRIVATE LIBZIPPP_EXPORTS)
 else()
@@ -42,9 +42,9 @@ if(LIBZIPPP_BUILD_TESTS)
   add_test(NAME libzippp_tests COMMAND libzippp_test)
 
   if (BUILD_SHARED_LIBS)
-	set_target_properties(libzippp_test PROPERTIES OUTPUT_NAME "libzippp_shared_test")
+    set_target_properties(libzippp_test PROPERTIES OUTPUT_NAME "libzippp_shared_test")
   else()
-	set_target_properties(libzippp_test PROPERTIES OUTPUT_NAME "libzippp_static_test")
+    set_target_properties(libzippp_test PROPERTIES OUTPUT_NAME "libzippp_static_test")
   endif()
 endif()
 

cmake/FindLIBZIP.cmake

@@ -23,9 +23,9 @@ find_package_handle_standard_args(
 )
 
 if (LIBZIP_FOUND)
-    if (NOT TARGET libzip::libzip)
-        add_library(libzip::libzip UNKNOWN IMPORTED)
-        set_target_properties(libzip::libzip
+    if (NOT TARGET libzip::zip)
+        add_library(libzip::zip UNKNOWN IMPORTED)
+        set_target_properties(libzip::zip
             PROPERTIES
                 INTERFACE_INCLUDE_DIRECTORIES ${LIBZIP_INCLUDE_DIR}
                 INTERFACE_LINK_LIBRARIES ZLIB::ZLIB
@@ -35,7 +35,7 @@ if (LIBZIP_FOUND)
         file(STRINGS ${_libzip_pkgcfg} _have_bzip2 REGEX Libs)
         if(_have_bzip2 MATCHES "-lbz2")
             find_package(BZip2 REQUIRED)
-            set_property(TARGET libzip::libzip APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2)
+            set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2)
         endif()
     endif()
 endif()