blob: 2ba40a79a58983bc32a249671fb3cae34fb1f1bd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
diff --unified --recursive --text proton-bridge-3.6.1.orig/internal/frontend/bridge-gui/BridgeSetup.cmake proton-bridge-3.6.1/internal/frontend/bridge-gui/BridgeSetup.cmake
--- proton-bridge-3.6.1.orig/internal/frontend/bridge-gui/BridgeSetup.cmake 2023-11-21 15:03:10.865099608 +0100
+++ proton-bridge-3.6.1/internal/frontend/bridge-gui/BridgeSetup.cmake 2023-11-21 15:03:34.591823916 +0100
@@ -51,17 +51,6 @@
# We rely on vcpkg for to get gRPC / Protobuf
# run build.sh / build.ps1 to get gRPC / Protobuf and dependencies installed.
-set(VCPKG_ROOT "${BRIDGE_REPO_ROOT}/extern/vcpkg")
-message(STATUS "VCPKG_ROOT is ${VCPKG_ROOT}")
-if (WIN32)
- find_program(VCPKG_EXE "${VCPKG_ROOT}/vcpkg.exe")
-else()
- find_program(VCPKG_EXE "${VCPKG_ROOT}/vcpkg")
-endif()
-if (NOT VCPKG_EXE)
- message(FATAL_ERROR "vcpkg is not installed. Run build.sh (macOS/Linux) or build.ps1 (Windows) first.")
-endif()
-
# For now we support only a single architecture for macOS (ARM64 or x86_64). We need to investigate how to build universal binaries with vcpkg.
if (APPLE)
if (NOT DEFINED CMAKE_OSX_ARCHITECTURES)
@@ -86,5 +75,3 @@
message(STATUS "Building for Intel x64 Windows computers")
set(VCPKG_TARGET_TRIPLET x64-windows)
endif()
-
-set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain")
\ No newline at end of file
|