aboutsummaryrefslogtreecommitdiff
path: root/ports/xalan-c
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-17 04:46:38 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-03-20 21:49:53 -0700
commitd5e433f03bf5220ef075489c18f5d1522fda1a4d (patch)
tree6c2d2d5dd8877ec68e5f90570037d0feee4399d6 /ports/xalan-c
parent0170cdf5abc7719e7819613dfa2263510efd45c3 (diff)
downloadvcpkg-d5e433f03bf5220ef075489c18f5d1522fda1a4d.tar.gz
vcpkg-d5e433f03bf5220ef075489c18f5d1522fda1a4d.zip
[vcpkg-build-msbuild] Add option to use vcpkg's integration. Fixes #891. Fixes #828.
Diffstat (limited to 'ports/xalan-c')
-rw-r--r--ports/xalan-c/portfile.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake
index 55dd9f143..4f4da9143 100644
--- a/ports/xalan-c/portfile.cmake
+++ b/ports/xalan-c/portfile.cmake
@@ -45,15 +45,15 @@ endif()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/c/projects/Win32/VC10/AllInOne/AllInOne.vcxproj
PLATFORM ${BUILD_ARCH}
- # Need this for it to pick up xerces-c port: https://github.com/Microsoft/vcpkg/issues/891
- OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets)
+ USE_VCPKG_INTEGRATION
+)
# This is needed to generate the required LocalMsgIndex.hpp header
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/c/projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
PLATFORM ${BUILD_ARCH}
- # Need this for it to pick up xerces-c port: https://github.com/Microsoft/vcpkg/issues/891
- OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets)
+ USE_VCPKG_INTEGRATION
+)
file(COPY ${SOURCE_PATH}/c/Build/${OUTPUT_DIR}/VC10/Debug/XalanMessages_1_11D.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(COPY ${SOURCE_PATH}/c/Build/${OUTPUT_DIR}/VC10/Debug/Xalan-C_1_11D.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)