Merge pull request #99 from microsoft/vcpkgfeatures

Add vcpkg port features

Author: abeltrano

.github/actions/build-with-host/action.yml

@@ -53,7 +53,7 @@ runs:
 
   - name: CMake Configure Cross-Compile ${{ inputs.arch }}
     if: ${{ inputs.arch }}
-    run: cmake --preset ${{ inputs.preset-name }} --fresh -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -DNETREMOTE_DISABLE_TESTS=TRUE -A ${{ inputs.arch }}
+    run: cmake --preset ${{ inputs.preset-name }} --fresh -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -DNETREMOTE_EXCLUDE_TESTS=TRUE -A ${{ inputs.arch }}
     shell: pwsh
 
   - name: CMake Build

CMakeLists.txt

@@ -5,6 +5,10 @@ cmake_minimum_required(VERSION 3.25)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 include(vcpkg)
 option(NETREMOTE_VCPKG_BUILD_FOR_PORT "Enable building the project via a vcpkg port" OFF)
+option(NETREMOTE_EXCLUDE_PROTOCOL "Disable building the protocol" OFF)
+option(NETREMOTE_EXCLUDE_SERVER "Disable building the server" OFF)
+option(NETREMOTE_EXCLUDE_TOOLS "Disable building the tools" OFF)
+option(NETREMOTE_EXCLUDE_TESTS "Disable building the tests" OFF)
 
 # vcpkg build target.
 # 
@@ -109,15 +113,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GN
       -Wl,-z,relro
       -z noexecstack
     )
-    if (NOF_CODE_COVERAGE)
+    if (NETREMOTE_CODE_COVERAGE)
       add_compile_options(
         -fprofile-arcs
         -ftest-coverage
       )
     endif()
   # clang specific options
   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    if (NOF_CODE_COVERAGE)
+    if (NETREMOTE_CODE_COVERAGE)
       add_compile_options(
         -fprofile-instr-generate
         -fcoverage-mapping
@@ -149,9 +153,12 @@ if (WERROR)
 endif()
 
 add_subdirectory(packaging)
-add_subdirectory(protocol)
 add_subdirectory(src)
 
-if (NOT NETREMOTE_DISABLE_TESTS)
+if (NOT NETREMOTE_EXCLUDE_PROTOCOL)
+  add_subdirectory(protocol)
+endif()
+
+if (NOT NETREMOTE_EXCLUDE_TESTS)
   add_subdirectory(tests)
 endif()

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

@@ -10,10 +10,18 @@ vcpkg_find_acquire_program(
     GIT
 )
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        protocol NETREMOTE_EXCLUDE_PROTOCOL
+        server NETREMOTE_EXCLUDE_SERVER
+        tests NETREMOTE_EXCLUDE_TESTS
+        tools NETREMOTE_EXCLUDE_TOOLS
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DNETREMOTE_DISABLE_TESTS=TRUE
         ${FEATURE_OPTIONS}
 )
 

packaging/vcpkg/ports/netremote/vcpkg.json

@@ -21,5 +21,35 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
+  ],
+  "features": {
+    "protocol": {
+      "description": "Enable building the client protocol",
+      "dependencies": [
+        "grpc",
+        "protobuf"
+      ]
+    },
+    "server":{
+      "description": "Enable building the server",
+      "dependencies": [
+        "netremote"
+      ]
+    },
+    "tests":{
+      "description": "Enable building the tests",
+      "dependencies": [
+        "netremote"
+      ]
+    },
+    "tools":{
+      "description": "Enable building the tools",
+      "dependencies": [
+        "netremote"
+      ]
+    }
+  },
+  "default-features": [
+    "protocol"
   ]
 }

src/linux/CMakeLists.txt

@@ -1,7 +1,13 @@
 
 add_subdirectory(external)
 add_subdirectory(libnl-helpers)
-add_subdirectory(server)
-add_subdirectory(tools)
 add_subdirectory(wifi)
 add_subdirectory(wpa-controller)
+
+if (NOT NETREMOTE_EXCLUDE_TOOLS)
+    add_subdirectory(tools)
+endif()
+
+if (NOT NETREMOTE_EXCLUDE_SERVER)
+    add_subdirectory(server)
+endif()

src/windows/CMakeLists.txt

@@ -17,4 +17,6 @@ add_compile_options(
     /bigobj
 )
 
-add_subdirectory(server)
+if (NOT NETREMOTE_EXCLUDE_SERVER)
+    add_subdirectory(server)
+endif()