diff options
| author | Simone Gasparini <simone.gasparini@gmail.com> | 2021-10-13 23:05:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 14:05:51 -0700 |
| commit | 9451badf3e48a5e728ea9b132719bf472a557324 (patch) | |
| tree | 09c20ae1560accde0f61ca62e929fcfddc883c78 | |
| parent | 050ee6cce0ea11b57cd2ae60857af839dfbe4be6 (diff) | |
| download | vcpkg-9451badf3e48a5e728ea9b132719bf472a557324.tar.gz vcpkg-9451badf3e48a5e728ea9b132719bf472a557324.zip | |
[CCTag] Update to v1.0.1 (#20603)
* [cctag] fix find cuda
* [cctag] upgrade to 1.0.1
* [cctag] migrating to new vcpkg_cmake_* functions
* [cctag] update baseline and version
| -rw-r--r-- | ports/cctag/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/cctag/vcpkg.json | 12 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/cctag.json | 5 |
4 files changed, 23 insertions, 11 deletions
diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake index 36cf48c04..a217d98f7 100644 --- a/ports/cctag/portfile.cmake +++ b/ports/cctag/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alicevision/cctag
- REF v1.0.0
- SHA512 49028356215dd703727b2eedd6aa72d81af84e5ca36f8dc7e9caf85a85c7f500b3eeaaa7369314a40049a72593d70049b709b453c30ff352d98ab0dea3afef76
+ REF v1.0.1
+ SHA512 94992141094162d44cf45ad85324517638bf794d693c6a059d6ba5d5ccbedea4f98664a0cc49ebca78f85d2860b637dfcb9d5315114493643a6c7f8fabab3073
HEAD_REF develop
)
@@ -13,21 +13,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS )
if("cuda" IN_LIST FEATURES)
- include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake)
+ include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake)
vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT)
message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}")
endif()
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS -DCCTAG_BUILD_TESTS:BOOL=OFF ${FEATURE_OPTIONS}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CCTag)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CCTag)
vcpkg_copy_pdbs()
diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index b90383fc7..37d3e6460 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cctag", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", @@ -32,7 +32,15 @@ "boost-unordered", "eigen3", "opencv3", - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "apps": { diff --git a/versions/baseline.json b/versions/baseline.json index 8ed974469..79dae143f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1249,7 +1249,7 @@ "port-version": 8 }, "cctag": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "cctz": { diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index fafc644be..fd2de346b 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ffcc7bde96142c2bc54827e3a2280accc592452e", + "version-semver": "1.0.1", + "port-version": 0 + }, + { "git-tree": "8abc2227c7e5fc5232f928d407d5dac772afb48b", "version-semver": "1.0.0", "port-version": 0 |