diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake index d412f1148b8..cd8bf8b615d 100644 --- a/ports/asyncplusplus/portfile.cmake +++ b/ports/asyncplusplus/portfile.cmake @@ -8,23 +8,14 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME async++) -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake) - -file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}") - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/asyncplusplus/vcpkg.json b/ports/asyncplusplus/vcpkg.json index d768e7bed2f..6b597765592 100644 --- a/ports/asyncplusplus/vcpkg.json +++ b/ports/asyncplusplus/vcpkg.json @@ -1,7 +1,18 @@ { "name": "asyncplusplus", - "version-string": "1.1", - "port-version": 1, + "version": "1.1", + "port-version": 2, "description": "Async++ is a lightweight concurrency framework for C++11", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/asyncplusplus.json b/versions/a-/asyncplusplus.json index 4de790bf2bd..f11d1aab077 100644 --- a/versions/a-/asyncplusplus.json +++ b/versions/a-/asyncplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "454f29e635dba103d5d48a5b1e9ba9842fb4864e", + "version": "1.1", + "port-version": 2 + }, { "git-tree": "15a66956fc29d87d60f48bfc7aa3ca823554734e", "version-string": "1.1", diff --git a/versions/baseline.json b/versions/baseline.json index f52223c64a5..7d53f6c2f38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -222,7 +222,7 @@ }, "asyncplusplus": { "baseline": "1.1", - "port-version": 1 + "port-version": 2 }, "at-spi2-atk": { "baseline": "2.38.0",