mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 13:59:06 +08:00
b97849d258
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6. In a recent CI build, we started getting output like: Installing package libp7-baical[core]:x86-windows... The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows Installed by libp7client:x86-windows bin/P7x32.dll bin/P7x32.pdb debug/bin/P7x32d.dll debug/bin/P7x32d.pdb include/P7/GTypes.h include/P7/P7_Client.h include/P7/P7_Cproxy.h include/P7/P7_Extensions.h include/P7/P7_Telemetry.h include/P7/P7_Trace.h It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version. * [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure. * Fix several "passing: remove from fail list." * [akali] Disable parallel configure. REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt. Attempts to fix: CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp CMake Error: : System Error: Permission denied CMake Error at CMakeLists.txt:20 (configure_file): configure_file Problem configuring file * [nvtt] Devendor libsquish This was regressed by https://github.com/microsoft/vcpkg/pull/13674 REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt. Installing package nvtt[core]:x64-linux... The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux Installed by libsquish:x64-linux debug/lib/libsquishd.a include/squish.h lib/libsquish.a * [knet] Disable parallel configure. REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at src/CMakeLists.txt:1 (configure_file): configure_file Problem configuring file * [libnice] Diable parallel configure. REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt. CMake Error at CMakeLists.txt:13 (configure_file): configure_file Problem configuring file
28 lines
832 B
CMake
28 lines
832 B
CMake
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
|
|
|
|
vcpkg_download_distfile(ARCHIVE
|
|
URLS http://baical.net/files/libP7Client_v5.6.zip
|
|
FILENAME libP7Client_v5.6.zip
|
|
SHA512 992256854b717a45ae9e11ed16aa27b8b054de97718f027664634597d756aa26fe10dcad765cde7695802c90def46461abbcbfde81923fdd40ea2b659e1a8240
|
|
)
|
|
|
|
vcpkg_extract_source_archive_ex(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
ARCHIVE "${ARCHIVE}"
|
|
NO_REMOVE_ONE_LEVEL
|
|
)
|
|
|
|
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
|
|
|
vcpkg_configure_cmake(
|
|
SOURCE_PATH ${SOURCE_PATH}
|
|
PREFER_NINJA
|
|
)
|
|
|
|
vcpkg_install_cmake()
|
|
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)
|