diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-08-06 03:57:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 12:57:16 -0700 |
| commit | a7cf0bc0e3fbbc440e5af51e776765bf04f954c4 (patch) | |
| tree | 70689fdb41c7651f2d23215fe4ab0233ee5f4986 | |
| parent | b0b241fc336251a76b10386f513abc5ec2b3c561 (diff) | |
| download | vcpkg-a7cf0bc0e3fbbc440e5af51e776765bf04f954c4.tar.gz vcpkg-a7cf0bc0e3fbbc440e5af51e776765bf04f954c4.zip | |
[wavpack] Fix failure on linux and osx (#12742)
| -rw-r--r-- | ports/wavpack/CONTROL | 4 | ||||
| -rw-r--r-- | ports/wavpack/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL index e8edf703e..a0052e027 100644 --- a/ports/wavpack/CONTROL +++ b/ports/wavpack/CONTROL @@ -1,4 +1,6 @@ Source: wavpack
-Version: 5.2.0 +Version: 5.2.0
+Port-Version: 1 Homepage: https://github.com/dbry/WavPack
Description: WavPack encode/decode library, command-line programs, and several plugins
+Supports: !(arm|arm64)
\ No newline at end of file diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index c59374aa3..f2b7d87cf 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -24,13 +24,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+if(VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WavPack)
+endif()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME wavpack)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8b1c6b31c..a2d6cf9af 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1836,9 +1836,6 @@ vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x86-windows = skip wampcc:arm64-windows=fail -wavpack:arm64-windows=fail -wavpack:x64-linux=fail -wavpack:x64-osx=fail wepoll:arm-uwp=fail wepoll:x64-uwp=fail wepoll:x64-linux=fail |