diff --git a/ports/zookeeper/portfile.cmake b/ports/zookeeper/portfile.cmake index 1dfcfb376b..ff67f07506 100644 --- a/ports/zookeeper/portfile.cmake +++ b/ports/zookeeper/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.5/apache-zookeeper-3.5.5.tar.gz" - FILENAME "zookeeper-3.5.5.tar.gz" - SHA512 4e22df899a83ca3cc15f6d94daadb1a8631fb4108e67b4f56d1f4fcf95f10f89c8ff1fb8a7c84799a3856d8803a8db1e1f2f3fe1b7dc0d6cedf485ef90fd212d + URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.6/apache-zookeeper-3.5.6.tar.gz" + FILENAME "zookeeper-3.5.6.tar.gz" + SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0 ) vcpkg_extract_source_archive_ex( @@ -14,26 +14,25 @@ vcpkg_extract_source_archive_ex( win32.patch ) -set(WANT_SYNCAPI OFF) -if("sync" IN_LIST FEATURES) - set(WANT_SYNCAPI ON) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c - DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA - OPTIONS - -DWANT_CPPUNIT=OFF - -DWANT_SYNCAPI=${WANT_SYNCAPI} +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sync WANT_SYNCAPI ) -vcpkg_install_cmake() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DWANT_CPPUNIT=OFF + ${FEATURE_OPTIONS} +) -file(INSTALL ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zookeeper RENAME copyright) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup() -vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/zookeeper/vcpkg.json b/ports/zookeeper/vcpkg.json index 20e655e5aa..eee539a28d 100644 --- a/ports/zookeeper/vcpkg.json +++ b/ports/zookeeper/vcpkg.json @@ -1,8 +1,19 @@ { "name": "zookeeper", - "version-string": "3.5.5", - "port-version": 2, + "version": "3.5.6", "description": "ZooKeeper C bindings", + "homepage": "https://github.com/apache/zookeeper", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "sync" ], diff --git a/versions/baseline.json b/versions/baseline.json index 73eaf6ff1d..0e61f69972 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7697,8 +7697,8 @@ "port-version": 0 }, "zookeeper": { - "baseline": "3.5.5", - "port-version": 2 + "baseline": "3.5.6", + "port-version": 0 }, "zopfli": { "baseline": "1.0.3", diff --git a/versions/z-/zookeeper.json b/versions/z-/zookeeper.json index ab8b9e6789..61432ca7df 100644 --- a/versions/z-/zookeeper.json +++ b/versions/z-/zookeeper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc", + "version": "3.5.6", + "port-version": 0 + }, { "git-tree": "44fbecb403595fea598756cf946b00e0a2f21dad", "version-string": "3.5.5",