summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-03-05 08:52:43 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2019-03-05 08:52:43 +0100
commit706ef38cf3e2c573db797ec5b7fb3151799760d1 (patch)
treee454fb55ecde96040434740e42551a7c68bf4785
parent98f450cfd329a3047ee347b4afde7f936e93a1cb (diff)
parent577d90201903adb62f2bb31a9ef2541731b4cea0 (diff)
downloadATCD-706ef38cf3e2c573db797ec5b7fb3151799760d1.tar.gz
Fixed merge
-rw-r--r--azure-pipelines.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0a21fb7249a..12a3ea8c413 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,10 +106,11 @@ jobs:
vcpkgarch: x86-windows
vcpkglibdir: lib
variables:
+ VCPKG_ROOT: C:\vcpkg
XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
- XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkglibdir)
+ XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
- SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkglibdir)
+ SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir)
steps:
- powershell: |
vcpkg install --recurse --triplet $(vcpkgarch) openssl xerces-c