From 1a7ee6e10b339883866e330d46ddf7b581733e98 Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Sat, 3 Aug 2024 20:08:46 +0000 Subject: [PATCH 1/4] Feature reorg. --- CMakeLists.txt | 5 +- .../vcpkg/ports/netremote/portfile.cmake.in | 3 +- protocol/CMakeLists.txt | 43 ++++++++-- vcpkg.json | 83 ++++++++++++------- 4 files changed, 95 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ac8c16d..0663f59d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,8 @@ include(vcpkg) option(NETREMOTE_VCPKG_BUILD_FOR_PORT "Enable building the project via a vcpkg port" OFF) # Add options for vcpkg port file features. -option(NETREMOTE_EXCLUDE_PROTOCOL "Disable building the protocol" OFF) +option(NETREMOTE_EXCLUDE_API "Disable providing the protocol buffers + gRPC API source files" OFF) +option(NETREMOTE_EXCLUDE_API_BINDINGS "Disable building the API protocol buffers + gRPC bindings" 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) @@ -100,7 +101,7 @@ add_subdirectory(config) add_subdirectory(packaging) add_subdirectory(src) -if (NOT NETREMOTE_EXCLUDE_PROTOCOL) +if (NOT NETREMOTE_EXCLUDE_API) add_subdirectory(protocol) endif() diff --git a/packaging/vcpkg/ports/netremote/portfile.cmake.in b/packaging/vcpkg/ports/netremote/portfile.cmake.in index 1228dc84..074510d2 100644 --- a/packaging/vcpkg/ports/netremote/portfile.cmake.in +++ b/packaging/vcpkg/ports/netremote/portfile.cmake.in @@ -19,7 +19,8 @@ vcpkg_find_acquire_program( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - protocol NETREMOTE_EXCLUDE_PROTOCOL + api NETREMOTE_EXCLUDE_API + api-bindings NETREMOTE_EXCLUDE_API_BINDINGS server NETREMOTE_EXCLUDE_SERVER tests NETREMOTE_EXCLUDE_TESTS tools NETREMOTE_EXCLUDE_TOOLS diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt index f544dbbf..08739088 100644 --- a/protocol/CMakeLists.txt +++ b/protocol/CMakeLists.txt @@ -16,6 +16,16 @@ set(PROTO_FILES ${PROTO_DIR}/WifiCore.proto ) +add_library(${PROJECT_NAME}-api INTERFACE "") +target_sources(${PROJECT_NAME}-api + PUBLIC + FILE_SET HEADERS + BASE_DIRS + ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE} + FILES + ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX}/NetRemoteProtocol.hxx +) + # Create a list of the generated headers. The below code isn't used because # we've encountered intermittent errors when building with external vcpkg (eg. # via port) which results in empty file lists and thus, the generated headers @@ -86,11 +96,28 @@ protobuf_generate(TARGET ${PROJECT_NAME}-protocol PROTOC_OUT_DIR ${PROTO_DIR_BINARY} ) -install( - TARGETS ${PROJECT_NAME}-protocol - EXPORT ${PROJECT_NAME} - COMPONENT dev - FILE_SET HEADERS - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}/${PROTO_DIR_BINARY_SUFFIX}" -) +if (NOT NETREMOTE_EXCLUDE_API) + install( + FILES + ${PROTO_FILES} + DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}/api" + ) + install( + TARGETS ${PROJECT_NAME}-api + EXPORT ${PROJECT_NAME} + COMPONENT dev + FILE_SET HEADERS + PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" + ) +endif() + +if (NOT NETREMOTE_EXCLUDE_API_BINDINGS) + install( + TARGETS ${PROJECT_NAME}-protocol + EXPORT ${PROJECT_NAME} + COMPONENT dev + FILE_SET HEADERS + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" + ) +endif() diff --git a/vcpkg.json b/vcpkg.json index f5d0ba44..3b4a234c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,14 +3,6 @@ "name": "netremote", "version-string": "0.4.1", "dependencies": [ - { - "name": "sdbus-cpp", - "platform": "linux" - }, - { - "name": "libsystemd", - "platform": "linux" - }, { "name": "vcpkg-cmake", "host": true @@ -18,18 +10,7 @@ { "name": "vcpkg-cmake-config", "host": true - }, - { - "name": "wil", - "platform": "windows" - }, - "catch2", - "cli11", - "grpc", - "magic-enum", - "plog", - "protobuf", - "nlohmann-json" + } ], "overrides": [ { @@ -43,34 +24,80 @@ ] }, "features": { - "protocol": { - "description": "Enable building the client protocol", + "api": { + "description": "Provide the API protocol buffers + gRPC .proto source files" + }, + "api-bindings": { + "description": "Provide the API protocol buffers + gRPC library bindings", "dependencies": [ "grpc", - "protobuf" + "protobuf", + { + "name": "netremote", + "features": [ + "api" + ] + } ] }, "server":{ - "description": "Enable building the server", + "description": "Provide the server binary", "dependencies": [ - "netremote" + { + "name": "netremote", + "features": [ + "api-bindings" + ] + }, + { + "name": "sdbus-cpp", + "platform": "linux" + }, + { + "name": "libsystemd", + "platform": "linux" + }, + "cli11", + "magic-enum", + "plog", + "nlohmann-json" ] }, "tests":{ "description": "Enable building the tests", "dependencies": [ - "netremote" + "catch2", + "magic-enum", + "nlohmann-json", + "plog", + { + "name": "netremote", + "features": [ + "api-bindings", + "server" + ] + } ] }, "tools":{ "description": "Enable building the tools", "dependencies": [ - "netremote" + { + "name": "netremote", + "features": [ + "api-bindings", + "server" + ] + } ] } }, "default-features": [ - "protocol" + "api", + "api-bindings", + "server", + "tests", + "tools" ], "builtin-baseline": "9224b3bbd8df24999d85720b1d005dd6f969ade0" } \ No newline at end of file From c27495ff84578acda999489681bce70c68ae7044 Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Sat, 3 Aug 2024 20:18:22 +0000 Subject: [PATCH 2/4] Move protos to public header tree. --- protocol/CMakeLists.txt | 9 +++++++-- .../microsoft/net/remote/api}/NetRemoteDataStream.proto | 0 .../net/remote/api}/NetRemoteDataStreamingService.proto | 0 .../microsoft/net/remote/api}/NetRemoteNetwork.proto | 0 .../microsoft/net/remote/api}/NetRemoteService.proto | 0 .../microsoft/net/remote/api}/NetRemoteWifi.proto | 0 .../microsoft/net/remote/api}/Network8021x.proto | 0 .../microsoft/net/remote/api}/NetworkCore.proto | 0 .../microsoft/net/remote/api}/WifiCore.proto | 0 9 files changed, 7 insertions(+), 2 deletions(-) rename protocol/{protos => include/microsoft/net/remote/api}/NetRemoteDataStream.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/NetRemoteDataStreamingService.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/NetRemoteNetwork.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/NetRemoteService.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/NetRemoteWifi.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/Network8021x.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/NetworkCore.proto (100%) rename protocol/{protos => include/microsoft/net/remote/api}/WifiCore.proto (100%) diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt index 08739088..91586c0d 100644 --- a/protocol/CMakeLists.txt +++ b/protocol/CMakeLists.txt @@ -1,10 +1,15 @@ set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/include) + set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX microsoft/net/remote/protocol) set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE}/${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX}) -set(PROTO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/protos) -set(PROTO_DIR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX}) +set(NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX microsoft/net/remote/api) +set(NETREMOTE_API_PUBLIC_INCLUDE_PREFIX ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE}/${NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX}) + +set(PROTO_DIR ${NETREMOTE_API_PUBLIC_INCLUDE_PREFIX}) +set(PROTO_DIR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/${NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX}) + set(PROTO_FILES ${PROTO_DIR}/NetRemoteDataStream.proto ${PROTO_DIR}/NetRemoteDataStreamingService.proto diff --git a/protocol/protos/NetRemoteDataStream.proto b/protocol/include/microsoft/net/remote/api/NetRemoteDataStream.proto similarity index 100% rename from protocol/protos/NetRemoteDataStream.proto rename to protocol/include/microsoft/net/remote/api/NetRemoteDataStream.proto diff --git a/protocol/protos/NetRemoteDataStreamingService.proto b/protocol/include/microsoft/net/remote/api/NetRemoteDataStreamingService.proto similarity index 100% rename from protocol/protos/NetRemoteDataStreamingService.proto rename to protocol/include/microsoft/net/remote/api/NetRemoteDataStreamingService.proto diff --git a/protocol/protos/NetRemoteNetwork.proto b/protocol/include/microsoft/net/remote/api/NetRemoteNetwork.proto similarity index 100% rename from protocol/protos/NetRemoteNetwork.proto rename to protocol/include/microsoft/net/remote/api/NetRemoteNetwork.proto diff --git a/protocol/protos/NetRemoteService.proto b/protocol/include/microsoft/net/remote/api/NetRemoteService.proto similarity index 100% rename from protocol/protos/NetRemoteService.proto rename to protocol/include/microsoft/net/remote/api/NetRemoteService.proto diff --git a/protocol/protos/NetRemoteWifi.proto b/protocol/include/microsoft/net/remote/api/NetRemoteWifi.proto similarity index 100% rename from protocol/protos/NetRemoteWifi.proto rename to protocol/include/microsoft/net/remote/api/NetRemoteWifi.proto diff --git a/protocol/protos/Network8021x.proto b/protocol/include/microsoft/net/remote/api/Network8021x.proto similarity index 100% rename from protocol/protos/Network8021x.proto rename to protocol/include/microsoft/net/remote/api/Network8021x.proto diff --git a/protocol/protos/NetworkCore.proto b/protocol/include/microsoft/net/remote/api/NetworkCore.proto similarity index 100% rename from protocol/protos/NetworkCore.proto rename to protocol/include/microsoft/net/remote/api/NetworkCore.proto diff --git a/protocol/protos/WifiCore.proto b/protocol/include/microsoft/net/remote/api/WifiCore.proto similarity index 100% rename from protocol/protos/WifiCore.proto rename to protocol/include/microsoft/net/remote/api/WifiCore.proto From feb2bb2d9b752f43dda0f30fcdf6834d9dbd08eb Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Sat, 3 Aug 2024 21:16:27 +0000 Subject: [PATCH 3/4] Rename protcol -> api and separate api and protocol bits. --- CMakeLists.txt | 2 +- api/CMakeLists.txt | 26 ++++++ {protocol => api/protocol}/CMakeLists.txt | 83 +++++++------------ .../net/remote/protocol/NetRemoteProtocol.hxx | 0 .../protos}/NetRemoteDataStream.proto | 0 .../NetRemoteDataStreamingService.proto | 0 .../api => api/protos}/NetRemoteNetwork.proto | 0 .../api => api/protos}/NetRemoteService.proto | 0 .../api => api/protos}/NetRemoteWifi.proto | 0 .../api => api/protos}/Network8021x.proto | 0 .../api => api/protos}/NetworkCore.proto | 0 .../remote/api => api/protos}/WifiCore.proto | 0 12 files changed, 59 insertions(+), 52 deletions(-) create mode 100644 api/CMakeLists.txt rename {protocol => api/protocol}/CMakeLists.txt (66%) rename {protocol => api/protocol}/include/microsoft/net/remote/protocol/NetRemoteProtocol.hxx (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetRemoteDataStream.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetRemoteDataStreamingService.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetRemoteNetwork.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetRemoteService.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetRemoteWifi.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/Network8021x.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/NetworkCore.proto (100%) rename {protocol/include/microsoft/net/remote/api => api/protos}/WifiCore.proto (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0663f59d..8f9cab19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ add_subdirectory(packaging) add_subdirectory(src) if (NOT NETREMOTE_EXCLUDE_API) - add_subdirectory(protocol) + add_subdirectory(api) endif() if (NOT NETREMOTE_EXCLUDE_TESTS) diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt new file mode 100644 index 00000000..6378dc9a --- /dev/null +++ b/api/CMakeLists.txt @@ -0,0 +1,26 @@ + +set(PROTO_DIR ${CMAKE_CURRENT_LIST_DIR}/protos) + +# List of all protocol buffer files defining the API. +set(PROTO_FILES + ${PROTO_DIR}/NetRemoteDataStream.proto + ${PROTO_DIR}/NetRemoteDataStreamingService.proto + ${PROTO_DIR}/NetRemoteNetwork.proto + ${PROTO_DIR}/NetRemoteService.proto + ${PROTO_DIR}/NetRemoteWifi.proto + ${PROTO_DIR}/Network8021x.proto + ${PROTO_DIR}/NetworkCore.proto + ${PROTO_DIR}/WifiCore.proto +) + +# Install the .proto files for consumers that wish to build them themselves. +install( + FILES + ${PROTO_FILES} + DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}/api" +) + +# Include the API bindings (protocol) if they are not excluded. +if (NOT NETREMOTE_EXCLUDE_API_BINDINGS) + add_subdirectory(protocol) +endif() diff --git a/protocol/CMakeLists.txt b/api/protocol/CMakeLists.txt similarity index 66% rename from protocol/CMakeLists.txt rename to api/protocol/CMakeLists.txt index 91586c0d..c3881d2b 100644 --- a/protocol/CMakeLists.txt +++ b/api/protocol/CMakeLists.txt @@ -1,35 +1,9 @@ set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/include) - set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX microsoft/net/remote/protocol) set(NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE}/${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX}) -set(NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX microsoft/net/remote/api) -set(NETREMOTE_API_PUBLIC_INCLUDE_PREFIX ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE}/${NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX}) - -set(PROTO_DIR ${NETREMOTE_API_PUBLIC_INCLUDE_PREFIX}) -set(PROTO_DIR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/${NETREMOTE_API_PUBLIC_INCLUDE_SUFFIX}) - -set(PROTO_FILES - ${PROTO_DIR}/NetRemoteDataStream.proto - ${PROTO_DIR}/NetRemoteDataStreamingService.proto - ${PROTO_DIR}/NetRemoteNetwork.proto - ${PROTO_DIR}/NetRemoteService.proto - ${PROTO_DIR}/NetRemoteWifi.proto - ${PROTO_DIR}/Network8021x.proto - ${PROTO_DIR}/NetworkCore.proto - ${PROTO_DIR}/WifiCore.proto -) - -add_library(${PROJECT_NAME}-api INTERFACE "") -target_sources(${PROJECT_NAME}-api - PUBLIC - FILE_SET HEADERS - BASE_DIRS - ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE} - FILES - ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX}/NetRemoteProtocol.hxx -) +set(PROTO_DIR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_SUFFIX}) # Create a list of the generated headers. The below code isn't used because # we've encountered intermittent errors when building with external vcpkg (eg. @@ -63,7 +37,9 @@ set(PROTO_HEADERS_GENERATED_GRPC ${PROTO_DIR_BINARY}/WifiCore.grpc.pb.h ) +# Define a static library containing pre-built protocol buffer and gRPC bindings. add_library(${PROJECT_NAME}-protocol STATIC "") +add_library(${PROJECT_NAME}-api-bindings ALIAS ${PROJECT_NAME}-protocol) target_sources(${PROJECT_NAME}-protocol PRIVATE @@ -86,6 +62,7 @@ target_link_libraries(${PROJECT_NAME}-protocol gRPC::grpc++_unsecure ) +# Generate C++ headers and sources (.pb.[h|cc]) of the protocol buffer data types. protobuf_generate(TARGET ${PROJECT_NAME}-protocol LANGUAGE cpp IMPORT_DIRS ${PROTO_DIR} @@ -93,6 +70,7 @@ protobuf_generate(TARGET ${PROJECT_NAME}-protocol PROTOC_OUT_FILES ${PROTO_FILES} ) +# Generate C++ headers and sources with gRPC support (.grpc.pb.[h|cc]) of the protocol buffer data types. protobuf_generate(TARGET ${PROJECT_NAME}-protocol LANGUAGE grpc GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc @@ -101,28 +79,31 @@ protobuf_generate(TARGET ${PROJECT_NAME}-protocol PROTOC_OUT_DIR ${PROTO_DIR_BINARY} ) -if (NOT NETREMOTE_EXCLUDE_API) - install( - FILES - ${PROTO_FILES} - DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}/api" - ) - install( - TARGETS ${PROJECT_NAME}-api - EXPORT ${PROJECT_NAME} - COMPONENT dev - FILE_SET HEADERS - PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" - ) -endif() +install( + TARGETS ${PROJECT_NAME}-protocol + EXPORT ${PROJECT_NAME} + COMPONENT dev + FILE_SET HEADERS + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" +) + +# Define a header-only (interface) library containing public protocol information. +add_library(${PROJECT_NAME}-api INTERFACE "") -if (NOT NETREMOTE_EXCLUDE_API_BINDINGS) - install( - TARGETS ${PROJECT_NAME}-protocol - EXPORT ${PROJECT_NAME} - COMPONENT dev - FILE_SET HEADERS - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" - ) -endif() +target_sources(${PROJECT_NAME}-api + PUBLIC + FILE_SET HEADERS + BASE_DIRS + ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE} + FILES + ${NETREMOTE_PROTOCOL_PUBLIC_INCLUDE_PREFIX}/NetRemoteProtocol.hxx +) + +install( + TARGETS ${PROJECT_NAME}-api + EXPORT ${PROJECT_NAME} + COMPONENT dev + FILE_SET HEADERS + PUBLIC_HEADER DESTINATION "${NETREMOTE_DIR_INSTALL_PUBLIC_HEADER_BASE}" +) diff --git a/protocol/include/microsoft/net/remote/protocol/NetRemoteProtocol.hxx b/api/protocol/include/microsoft/net/remote/protocol/NetRemoteProtocol.hxx similarity index 100% rename from protocol/include/microsoft/net/remote/protocol/NetRemoteProtocol.hxx rename to api/protocol/include/microsoft/net/remote/protocol/NetRemoteProtocol.hxx diff --git a/protocol/include/microsoft/net/remote/api/NetRemoteDataStream.proto b/api/protos/NetRemoteDataStream.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetRemoteDataStream.proto rename to api/protos/NetRemoteDataStream.proto diff --git a/protocol/include/microsoft/net/remote/api/NetRemoteDataStreamingService.proto b/api/protos/NetRemoteDataStreamingService.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetRemoteDataStreamingService.proto rename to api/protos/NetRemoteDataStreamingService.proto diff --git a/protocol/include/microsoft/net/remote/api/NetRemoteNetwork.proto b/api/protos/NetRemoteNetwork.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetRemoteNetwork.proto rename to api/protos/NetRemoteNetwork.proto diff --git a/protocol/include/microsoft/net/remote/api/NetRemoteService.proto b/api/protos/NetRemoteService.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetRemoteService.proto rename to api/protos/NetRemoteService.proto diff --git a/protocol/include/microsoft/net/remote/api/NetRemoteWifi.proto b/api/protos/NetRemoteWifi.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetRemoteWifi.proto rename to api/protos/NetRemoteWifi.proto diff --git a/protocol/include/microsoft/net/remote/api/Network8021x.proto b/api/protos/Network8021x.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/Network8021x.proto rename to api/protos/Network8021x.proto diff --git a/protocol/include/microsoft/net/remote/api/NetworkCore.proto b/api/protos/NetworkCore.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/NetworkCore.proto rename to api/protos/NetworkCore.proto diff --git a/protocol/include/microsoft/net/remote/api/WifiCore.proto b/api/protos/WifiCore.proto similarity index 100% rename from protocol/include/microsoft/net/remote/api/WifiCore.proto rename to api/protos/WifiCore.proto From 3d91cacf016846834b939ef116cffdf71b23a7e7 Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Mon, 5 Aug 2024 09:02:03 -0600 Subject: [PATCH 4/4] Remove remaining bits of wil references. --- src/windows/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/windows/CMakeLists.txt b/src/windows/CMakeLists.txt index cf5f2386..a14c5950 100644 --- a/src/windows/CMakeLists.txt +++ b/src/windows/CMakeLists.txt @@ -1,8 +1,3 @@ -# Make public version of wil available. -set(WIL_BUILD_TESTS OFF CACHE INTERNAL "Turn off wil tests") -set(WIL_BUILD_PACKAGING OFF CACHE INTERNAL "Turn off wil packaging") - -find_package(wil CONFIG REQUIRED) # Add Windows-specific global compile definitions. add_compile_definitions(