mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 00:17:50 +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
34 lines
1.7 KiB
CMake
34 lines
1.7 KiB
CMake
include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
|
|
|
|
# Explicitly disable cross-compilation until the upstream discussion
|
|
# https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved
|
|
if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
|
set(ignition_msgs_CROSSCOMPILING ON)
|
|
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME)
|
|
set(ignition_msgs_CROSSCOMPILING ON)
|
|
else()
|
|
set(ignition_msgs_CROSSCOMPILING OFF)
|
|
endif()
|
|
|
|
if(ignition_msgs_CROSSCOMPILING)
|
|
message(FATAL_ERROR "This port does not currently support triplets that require cross-compilation.")
|
|
endif()
|
|
|
|
# This port needs to generate protobuf messages with a custom plugin generator,
|
|
# so it needs to have in Windows the relative protobuf dll available in the PATH
|
|
set(path_backup $ENV{PATH})
|
|
vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
|
|
vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin)
|
|
|
|
ignition_modular_library(NAME msgs
|
|
VERSION "1.0.0"
|
|
# See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match
|
|
REF ignition-msgs_1.0.0
|
|
SHA512 3a270f0ac988b947091d4626be48fe8cfed5ddfde5a37b9d0f08fddcbf278099ab231fca11e2dd2296ca54e0350ea14e3f685dc238f0827f18f10ab7b75039de
|
|
# Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151)
|
|
PATCHES fix-protobuf-static-link-order.patch)
|
|
|
|
|
|
# Restore old path
|
|
set(ENV{PATH} ${path_backup})
|