You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2019/04/04 04:32:27 UTC
[qpid-proton] branch master updated: NO-JIRA: Add JsonCPP to
Appveyor CI build - Only add to VS2017 build, vcpkg doesn't work elsewhere
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new cf7fff0 NO-JIRA: Add JsonCPP to Appveyor CI build - Only add to VS2017 build, vcpkg doesn't work elsewhere
cf7fff0 is described below
commit cf7fff06995be914b9316dfbffae742d9a42a3aa
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Wed Apr 3 22:51:42 2019 -0400
NO-JIRA: Add JsonCPP to Appveyor CI build
- Only add to VS2017 build, vcpkg doesn't work elsewhere
---
.appveyor.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index 0fb3c64..19bb0e1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,17 +4,22 @@ environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: Visual Studio 15
+ VCPKG_INTEGRATION: '-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake'
- CMAKE_GENERATOR: Visual Studio 12
- CMAKE_GENERATOR: Visual Studio 10
install:
- cinst -y swig
+- vcpkg install jsoncpp:x86-windows
+- vcpkg install jsoncpp:x64-windows
+- vcpkg integrate install
cache:
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
+- C:\Tools\vcpkg\installed -> .appveyor.yml
before_build:
- mkdir BLD
- cd BLD
-- cmake -G "%CMAKE_GENERATOR%" %QPID_PROTON_CMAKE_ARGS% ..
+- cmake %VCPKG_INTEGRATION% -G "%CMAKE_GENERATOR%" %QPID_PROTON_CMAKE_ARGS% ..
- cd ..
build:
project: BLD/Proton.sln
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org