Skip to content

Commit 7b4d715

Browse files
authored
Merge pull request #323 from microsoft/release/v0.4.1
Release v0.4.1
2 parents 7089dc9 + 5395b07 commit 7b4d715

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

.docker/netremote-dev/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
33
"name": "netremote",
4-
"version-string": "0.4.0",
4+
"version-string": "0.4.1",
55
"dependencies": [
66
{
77
"name": "sdbus-cpp",

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ include(version)
1212

1313
# Configure vcpkg usage within the project.
1414
include(vcpkg)
15+
option(NETREMOTE_VCPKG_BUILD_FOR_PORT "Enable building the project via a vcpkg port" OFF)
1516

1617
# Add options for vcpkg port file features.
1718
option(NETREMOTE_EXCLUDE_PROTOCOL "Disable building the protocol" OFF)

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Default version values in case we can't get them from git.
33
set(VERSION_MAJOR 0)
44
set(VERSION_MINOR 4)
5-
set(VERSION_PATCH 0)
5+
set(VERSION_PATCH 1)
66

77
if (NOT GIT_EXECUTABLE)
88
message(WARNING "Git not found; falling back to hard-coded version")

packaging/CMakeLists.txt

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

2-
add_subdirectory(vcpkg)
2+
if (NOT NETREMOTE_VCPKG_BUILD_FOR_PORT)
3+
add_subdirectory(vcpkg)
4+
endif()
35

46
if (BUILD_FOR_LINUX)
57
add_subdirectory(deb)

packaging/vcpkg/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(VCPKG_PORT_FILE_OUT ${CMAKE_CURRENT_LIST_DIR}/ports/netremote/portfile.cmake
44
set(VCPKG_PORT_FILE_IN ${VCPKG_PORT_FILE_OUT}.in)
55

66
# Configure variables to be substituted in the vcpkg portfile.
7-
set(GIT_REF_HEAD master)
7+
set(GIT_REF_HEAD main)
88
set(GIT_REF v${CMAKE_PROJECT_VERSION})
99
set(GIT_REF_URL ${CMAKE_PROJECT_HOMEPAGE_URL}/archive/refs/tags/${GIT_REF}.tar.gz)
1010

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ vcpkg_check_features(
2828
vcpkg_cmake_configure(
2929
SOURCE_PATH ${SOURCE_PATH}
3030
OPTIONS
31+
-DNETREMOTE_VCPKG_BUILD_FOR_PORT=ON
3132
${FEATURE_OPTIONS}
3233
)
3334

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
33
"name": "netremote",
4-
"version-string": "0.4.0",
4+
"version-string": "0.4.1",
55
"dependencies": [
66
{
77
"name": "sdbus-cpp",

0 commit comments

Comments
 (0)