Skip to content

Commit b209ac1

Browse files
authored
Add vcpkg based dependency resolution for *nix platforms. (#913)
1 parent 8a1eec8 commit b209ac1

File tree

3 files changed

+79
-27
lines changed

3 files changed

+79
-27
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "vcpkg"]
22
path = vcpkg
3-
url = https://github.com/Microsoft/vcpkg
3+
url = https://github.com/BillyONeal/vcpkg

azure-pipelines.yml

Lines changed: 77 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -166,31 +166,46 @@ jobs:
166166
cd build.release/Release/Binaries
167167
./test_runner *test.so
168168
displayName: 'Run tests, release'
169-
170-
# vcpkg on Linux missing for now due to OpenSSL root certificates
171-
# - job: Ubuntu_1604_Vcpkg_Debug
172-
# pool:
173-
# vmImage: 'Ubuntu 16.04'
174-
# steps:
175-
# - script: |
176-
# ./vcpkg/bootstrap-vcpkg.sh
177-
# ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono
178-
# displayName: Apt install dependencies
179-
# - script: mkdir build.debug
180-
# displayName: Make build.debug
181-
# - task: CMake@1
182-
# inputs:
183-
# workingDirectory: 'build.debug'
184-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
185-
# - script: |
186-
# cd build.debug
187-
# ninja
188-
# displayName: 'Run ninja'
189-
# - script: |
190-
# cd build.debug/Release/Binaries
191-
# ./test_runner *test.so
192-
# displayName: 'Run Tests'
193-
- job: MacOS
169+
- job: Ubuntu_1604_Vcpkg
170+
pool:
171+
vmImage: 'Ubuntu 16.04'
172+
steps:
173+
- script: |
174+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
175+
sudo apt-get -y update
176+
sudo apt-get install g++-7 ninja-build -y
177+
./vcpkg/bootstrap-vcpkg.sh
178+
./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli
179+
displayName: Vcpkg install dependencies
180+
- script: |
181+
mkdir build.debug
182+
mkdir build.release
183+
displayName: Make Build Directories
184+
- task: CMake@1
185+
inputs:
186+
workingDirectory: 'build.debug'
187+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
188+
- task: CMake@1
189+
inputs:
190+
workingDirectory: 'build.release'
191+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
192+
- script: |
193+
cd build.debug
194+
ninja
195+
displayName: 'Run ninja debug'
196+
- script: |
197+
cd build.debug/Release/Binaries
198+
./test_runner *test.so
199+
displayName: 'Run Tests debug'
200+
- script: |
201+
cd build.release
202+
ninja
203+
displayName: 'Run ninja, release'
204+
- script: |
205+
cd build.release/Release/Binaries
206+
./test_runner *test.so
207+
displayName: 'Run tests, release'
208+
- job: MacOS_Homebrew
194209
pool:
195210
vmImage: 'macOS-10.13'
196211
steps:
@@ -233,3 +248,40 @@ jobs:
233248
cd build.release.static
234249
ninja
235250
displayName: 'Run ninja, release static'
251+
- job: MacOS_Vcpkg
252+
pool:
253+
vmImage: 'macOS-10.13'
254+
steps:
255+
- script: |
256+
brew install gcc ninja
257+
./vcpkg/bootstrap-vcpkg.sh
258+
./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli
259+
displayName: Vcpkg install dependencies
260+
- script: |
261+
mkdir build.debug
262+
mkdir build.release
263+
displayName: Make Build Directories
264+
- task: CMake@1
265+
inputs:
266+
workingDirectory: 'build.debug'
267+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
268+
- task: CMake@1
269+
inputs:
270+
workingDirectory: 'build.release'
271+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
272+
- script: |
273+
cd build.debug
274+
ninja
275+
displayName: 'Run ninja debug'
276+
- script: |
277+
cd build.debug/Release/Binaries
278+
./test_runner *test.dylib
279+
displayName: 'Run Tests debug'
280+
- script: |
281+
cd build.release
282+
ninja
283+
displayName: 'Run ninja, release'
284+
- script: |
285+
cd build.release/Release/Binaries
286+
./test_runner *test.dylib
287+
displayName: 'Run tests, release'

0 commit comments

Comments
 (0)