diff options
| author | Maxime Gervais <gervais.maxime@gmail.com> | 2020-05-11 23:44:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 14:44:02 -0700 |
| commit | 7fdfe9eaf7cd72a4db31bce6d6a4aa4b8b435586 (patch) | |
| tree | fb06fd26456472b326caad54a99509faf6dee33b | |
| parent | e886d4856164f1ecd052edf3825cd4e701e716b0 (diff) | |
| download | vcpkg-7fdfe9eaf7cd72a4db31bce6d6a4aa4b8b435586.tar.gz vcpkg-7fdfe9eaf7cd72a4db31bce6d6a4aa4b8b435586.zip | |
[libzen] Update to 0.4.38 (#11237)
* remove patch (merged upstream)
* update baseline (UWP support added)
| -rw-r--r-- | ports/libzen/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libzen/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/libzen/vcpkg_support_in_cmakelists.patch | 31 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 3 insertions, 38 deletions
diff --git a/ports/libzen/CONTROL b/ports/libzen/CONTROL index aca3ff287..7470be2bd 100644 --- a/ports/libzen/CONTROL +++ b/ports/libzen/CONTROL @@ -1,3 +1,3 @@ Source: libzen -Version: 0.4.37 +Version: 0.4.38 Description: ZenLib is a C++ utility library for easiest cross-platform development diff --git a/ports/libzen/portfile.cmake b/ports/libzen/portfile.cmake index 52ad55ef6..1a9bf9b2a 100644 --- a/ports/libzen/portfile.cmake +++ b/ports/libzen/portfile.cmake @@ -7,11 +7,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/ZenLib - REF v0.4.37 - SHA512 857091422d6425aeae59bf5a9dfedd72f5c9b4a18f29acf88842d812f2b470fc8b1b03a245af6b7d08d616dd5596a8905cc138daecee23dadea39ae4215f77d4 + REF v0.4.38 + SHA512 92c3fc3994bd7110021adbfa3ce48ed6e80f162946b912e9e06ed58edc224600e56e3aab3203ad3fa8759dab9790cb5536475f070f0c060b00585911a6cc0661 HEAD_REF master - - PATCHES vcpkg_support_in_cmakelists.patch ) vcpkg_configure_cmake( diff --git a/ports/libzen/vcpkg_support_in_cmakelists.patch b/ports/libzen/vcpkg_support_in_cmakelists.patch deleted file mode 100644 index fb2ce81f7..000000000 --- a/ports/libzen/vcpkg_support_in_cmakelists.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt -index cb96dc8..8b05a25 100644 ---- a/Project/CMake/CMakeLists.txt -+++ b/Project/CMake/CMakeLists.txt -@@ -33,10 +33,12 @@ set(BIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE STRING "Directory where - set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Directory where library will install") - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The directory the headers are installed in") - --if(NOT MSVC) -- set(ZenLib_CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/zenlib") -+if(VCPKG_TARGET_TRIPLET) -+ set(ZenLib_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/zenlib") -+elseif(MSVC) -+ set(ZenLib_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake") - else() -- set(ZenLib_CONFIG_INSTALL_DIR "cmake") -+ set(ZenLib_CONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/zenlib") - endif() - - set(ZenLib_HDRS -@@ -136,10 +138,6 @@ set_target_properties(zen PROPERTIES - PUBLIC_HEADER "${ZenLib_HDRS}" - ) - --if(MSVC) -- install(FILES $<TARGET_PDB_FILE:zen> DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS "Debug;RelWithDebInfo" OPTIONAL) --endif() -- - install(TARGETS zen EXPORT zen-export - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/ZenLib - RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 19588471b..c2f1680ca 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -989,8 +989,6 @@ libxslt:x64-osx=fail libxslt:x64-uwp=fail
libyuv:arm-uwp=fail
libyuv:x64-uwp=fail
-libzen:arm-uwp=fail
-libzen:x64-uwp=fail
libzippp:x64-linux=ignore
linenoise-ng:arm-uwp=fail
linenoise-ng:x64-uwp=fail
|