From 62c8c446a06a2fd3ab943d01adbe7ebb4a84fe23 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Mon, 4 Mar 2019 16:11:17 -0800 Subject: [PATCH 1/3] Update vcpkg. --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index c028db0b8d..c7d4696a88 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit c028db0b8d8a60b60963c5648d96af4ae02050d5 +Subproject commit c7d4696a8857235ec8e3497e43f0d6fe3d4b5396 From d07a952acf51dc393a8c69bae668d9d420d11f48 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 6 Mar 2019 12:52:18 -0800 Subject: [PATCH 2/3] Work around Azure Pipelines bug caused by global VCPKG_ROOT environment variable. --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e3bf3b299..2239d78c3b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root=.\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -38,7 +38,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root=.\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -90,7 +90,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root=.\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -121,7 +121,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root=.\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -194,7 +194,7 @@ jobs: sudo apt-get -y update sudo apt-get install g++-7 ninja-build -y ./vcpkg/bootstrap-vcpkg.sh - ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli + ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root=./vcpkg displayName: Vcpkg install dependencies - script: | mkdir build.debug @@ -284,7 +284,7 @@ jobs: - script: | brew install gcc ninja ./vcpkg/bootstrap-vcpkg.sh - ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli + ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root=./vcpkg displayName: Vcpkg install dependencies - script: | mkdir build.debug From e0dc70228aedf6e9d92bcf31a73ac31f4abe5543 Mon Sep 17 00:00:00 2001 From: "Billy O'Neal (VC LIBS)" Date: Wed, 6 Mar 2019 12:56:26 -0800 Subject: [PATCH 3/3] Syntax error! --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2239d78c3b..6ec1b11300 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root=.\vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -38,7 +38,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root=.\vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -90,7 +90,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root=.\vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --vcpkg-root .\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -121,7 +121,7 @@ jobs: steps: - script: .\vcpkg\bootstrap-vcpkg.bat displayName: Bootstrap vcpkg - - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root=.\vcpkg + - script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows --vcpkg-root .\vcpkg displayName: vcpkg install dependencies - script: mkdir build.common displayName: Make Build Directory @@ -194,7 +194,7 @@ jobs: sudo apt-get -y update sudo apt-get install g++-7 ninja-build -y ./vcpkg/bootstrap-vcpkg.sh - ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root=./vcpkg + ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg displayName: Vcpkg install dependencies - script: | mkdir build.debug @@ -284,7 +284,7 @@ jobs: - script: | brew install gcc ninja ./vcpkg/bootstrap-vcpkg.sh - ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root=./vcpkg + ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg displayName: Vcpkg install dependencies - script: | mkdir build.debug