File tree Expand file tree Collapse file tree 7 files changed +9
-5
lines changed
Expand file tree Collapse file tree 7 files changed +9
-5
lines changed Original file line number Diff line number Diff line change 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" ,
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ include(version)
1212
1313# Configure vcpkg usage within the project.
1414include (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.
1718option (NETREMOTE_EXCLUDE_PROTOCOL "Disable building the protocol" OFF )
Original file line number Diff line number Diff line change 22# Default version values in case we can't get them from git.
33set (VERSION_MAJOR 0)
44set (VERSION_MINOR 4)
5- set (VERSION_PATCH 0 )
5+ set (VERSION_PATCH 1 )
66
77if (NOT GIT_EXECUTABLE)
88 message (WARNING "Git not found; falling back to hard-coded version" )
Original file line number Diff line number Diff line change 11
2- add_subdirectory (vcpkg)
2+ if (NOT NETREMOTE_VCPKG_BUILD_FOR_PORT)
3+ add_subdirectory (vcpkg)
4+ endif ()
35
46if (BUILD_FOR_LINUX)
57 add_subdirectory (deb)
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set(VCPKG_PORT_FILE_OUT ${CMAKE_CURRENT_LIST_DIR}/ports/netremote/portfile.cmake
44set (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 )
88set (GIT_REF v${CMAKE_PROJECT_VERSION} )
99set (GIT_REF_URL ${CMAKE_PROJECT_HOMEPAGE_URL} /archive/refs/tags/${GIT_REF} .tar.gz)
1010
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ vcpkg_check_features(
2828vcpkg_cmake_configure(
2929 SOURCE_PATH ${SOURCE_PATH}
3030 OPTIONS
31+ -DNETREMOTE_VCPKG_BUILD_FOR_PORT=ON
3132 ${FEATURE_OPTIONS}
3233)
3334
Original file line number Diff line number Diff line change 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" ,
You can’t perform that action at this time.
0 commit comments