diff options
| author | Roger Leigh <rleigh@codelibre.net> | 2018-10-25 20:34:45 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 12:34:45 -0700 |
| commit | 6d5eba6a6d4f99a03f104e0a639cbbba5325d41b (patch) | |
| tree | c6c8ebcaa56f6c1b487cdd94027b9c1666d058df /ports | |
| parent | 03f4ab3808f90ebc1d3f99b86341d71748eb7364 (diff) | |
| download | vcpkg-6d5eba6a6d4f99a03f104e0a639cbbba5325d41b.tar.gz vcpkg-6d5eba6a6d4f99a03f104e0a639cbbba5325d41b.zip | |
xalan-c: Install headers correctly (#4565)
* Add SKIP_CLEAN option to vcpkg_install_msbuild
Also add vcpkg_clean_msbuild function to factor out clean
logic and allow re-use in portfiles.
* xalan-c: Correct header globbing
* vcpkg_install_msbuild: SKIP_CLEAN documentation correction
* [xalan-c] Add explicit check for localmsgindex header.
[docs] Regenerate
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/xalan-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xalan-c/portfile.cmake | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index 41c407477..aa2345462 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,4 +1,4 @@ Source: xalan-c -Version: 1.11-3 +Version: 1.11-4 Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index 181786e1b..4c035260a 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -39,14 +39,19 @@ vcpkg_install_msbuild( OPTIONS_RELEASE /p:XERCESCROOT=${CURRENT_INSTALLED_DIR} OPTIONS_DEBUG /p:XERCESCROOT=${CURRENT_INSTALLED_DIR}/debug LICENSE_SUBPATH c/LICENSE + SKIP_CLEAN ) file(COPY ${SOURCE_PATH}/c/src/xalanc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp) -# LocalMsgIndex.hpp is here -file(GLOB LOCALMSGINDEX ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_TRIPLET}-rel/*/c/Build/*/VC10/Release/Nls/Include/LocalMsgIndex.hpp) +# LocalMsgIndex.hpp and LocalMsgData.hpp are here +file(GLOB NLS_INCLUDES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/c/Build/*/VC10/Release/Nls/Include/*.hpp") +if(NOT NLS_INCLUDES) + message(FATAL_ERROR "Could not locate LocalMsgIndex.hpp") +endif() +file(COPY ${NLS_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xalanc/PlatformSupport) -file(COPY ${LOCALMSGINDEX} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xalanc/PlatformSupport) +vcpkg_clean_msbuild() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/NLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/util/MsgLoaders/ICU/resources) |