Skip to content

Commit cc54b8c

Browse files
authored
Merge pull request #282 from microsoft/cmakeportupdate
Update CMake vcpkg port with public catalog-hygiene related fixes.
2 parents 25b3c9d + 8ed8b16 commit cc54b8c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Default version values in case we can't get them from git.
33
set(VERSION_MAJOR 0)
4-
set(VERSION_MINOR 1)
4+
set(VERSION_MINOR 2)
55
set(VERSION_PATCH 0)
66

77
if (NOT GIT_EXECUTABLE)

packaging/vcpkg/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ set(VCPKG_DEVELOPMENT_GIT_REF ${GIT_REF_HEAD})
2626
set(VCPKG_DEVELOPMENT_GIT_REF_FETCH ${GIT_BRANCH_CURRENT})
2727

2828
# Current release versioning information.
29-
set(VCPKG_RELEASE_TAG v0.0.1)
29+
set(VCPKG_RELEASE_TAG v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
3030
set(VCPKG_RELEASE_URL ${GIT_URL_ORIGIN})
3131
set(VCPKG_RELEASE_GIT_REF ${VCPKG_RELEASE_TAG})
3232
set(VCPKG_RELEASE_GIT_REF_FETCH ${GIT_BRANCH_CURRENT})

packaging/vcpkg/ports/netremote/portfile.cmake.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ vcpkg_cmake_configure(
2727

2828
vcpkg_cmake_install()
2929
vcpkg_copy_pdbs()
30-
vcpkg_cmake_config_fixup()
30+
vcpkg_cmake_config_fixup(
31+
CONFIG_PATH lib/cmake/netremote
32+
)
3133

3234
file(REMOVE_RECURSE
3335
"${CURRENT_PACKAGES_DIR}/bin"

0 commit comments

Comments
 (0)