Sync libzip target name

Author: petk

cmake/cmake/modules/PHP/Package/LibXml2.cmake

@@ -1,15 +1,15 @@
 #[=============================================================================[
 # PHP/Package/LibXml2
 
-Finds and downloads the `libxml2` library:
+Finds or downloads the libxml2 library:
 
 ```cmake
 include(PHP/Package/LibXml2)
 ```
 
-This module first tries to find the `libxml2` library on the system. If not
-successful it tries to download it from the upstream source and builds it
-together with the PHP build.
+This module first tries to find the libxml2 library on the system. If not found
+it tries to download it from the upstream source and builds it together
+with the PHP build.
 
 See: https://cmake.org/cmake/help/latest/module/FindLibXml2.html
 

cmake/cmake/modules/PHP/Package/Oniguruma.cmake

@@ -7,11 +7,14 @@ Finds or downloads the Oniguruma library:
 include(PHP/Package/Oniguruma)
 ```
 
-This module first tries to find the `Oniguruma` library on the system. If not
-successful it downloads it from the upstream source during the main project
+This module first tries to find the Oniguruma library on the system. If not
+found it downloads it from the upstream source during the main project
 configuration phase and then configures and builds it during the main project's
 build phase.
 
+The `FetchContent` module is used, which provides integration with other
+dependency providers, such as Conan.
+
 ## Examples
 
 Basic usage:

cmake/cmake/modules/PHP/Package/PNG.cmake

@@ -7,8 +7,6 @@ Finds or downloads the PNG library:
 include(PHP/Package/PNG)
 ```
 
-Wrapper for finding the `PNG` library.
-
 Module first tries to find the `PNG` library on the system. If not
 successful it tries to download it from the upstream source and builds it
 together with the PHP build.

cmake/cmake/modules/PHP/Package/libzip.cmake

@@ -1,23 +1,22 @@
 #[=============================================================================[
 # PHP/Package/libzip
 
-Finds and downloads `libzip` library:
+Finds or downloads libzip library:
 
 ```cmake
 include(PHP/Package/libzip
 ```
 
-This module first tries to find the `libzip` library on the system. If not
-successful it tries to download it from the upstream source and builds it
-together with the PHP build.
+This module first tries to find the libzip library on the system. If not found
+it downloads it from the upstream source and builds it together with the build.
 
 ## Examples
 
 Basic usage:
 
 ```cmake
 include(PHP/Package/libzip
-target_link_libraries(php_ext_foo PRIVATE libzip::libzip)
+target_link_libraries(php_ext_foo PRIVATE libzip::zip)
 ```
 #]=============================================================================]
 
@@ -34,7 +33,7 @@ set(PHP_libzip_MIN_VERSION 1.7.1)
 set(PHP_libzip_DOWNLOAD_VERSION 1.11.4)
 
 macro(php_package_libzip_find)
-  if(TARGET libzip::libzip)
+  if(TARGET libzip::zip)
     set(libzip_FOUND TRUE)
     get_property(libzip_DOWNLOADED GLOBAL PROPERTY _PHP_libzip_DOWNLOADED)
     get_property(libzip_VERSION GLOBAL PROPERTY _PHP_libzip_VERSION)
@@ -99,10 +98,10 @@ macro(_php_package_libzip_download)
   # Bypass missing directory error for the imported target below.
   file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
 
-  add_library(libzip::libzip STATIC IMPORTED GLOBAL)
-  add_dependencies(libzip::libzip libzip-install)
+  add_library(libzip::zip STATIC IMPORTED GLOBAL)
+  add_dependencies(libzip::zip libzip-install)
   set_target_properties(
-    libzip::libzip
+    libzip::zip
     PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
       IMPORTED_LOCATION ${INSTALL_DIR}/lib/libzip${CMAKE_STATIC_LIBRARY_SUFFIX}

cmake/conanfile.txt

@@ -28,7 +28,7 @@ libsodium/1.0.20
 libxml2/2.13.8
 #libxpm/3.5.17 # Build error due to missing system packages.
 libxslt/1.1.43
-#libzip/1.11.3 # Builds ok, but CMake imported target name needs to be adjusted.
+libzip/1.11.3
 #lmdb/0.9.32 # Builds ok, but CMake imported target name needs to be adjusted.
 #net-snmp/5.9.4 # Builds ok, but CMake imported target name needs to be adjusted.
 odbc/2.3.11