mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 08:10:51 +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
47 lines
1.3 KiB
CMake
47 lines
1.3 KiB
CMake
project(P7)
|
|
cmake_minimum_required(VERSION 3.18)
|
|
|
|
add_library(P7
|
|
"Sources/ClBaical.cpp"
|
|
"Sources/ClFile.cpp"
|
|
"Sources/Client.cpp"
|
|
"Sources/ClNull.cpp"
|
|
"Sources/ClText.cpp"
|
|
"Sources/CRC32.cpp"
|
|
"Sources/Proxy.cpp"
|
|
"Sources/Telemetry.cpp"
|
|
"Sources/Trace.cpp")
|
|
|
|
target_include_directories(P7 PRIVATE "Headers/")
|
|
target_include_directories(P7 PRIVATE "Shared/")
|
|
if(WIN32)
|
|
target_include_directories(P7 PRIVATE "Shared/Platforms/Windows_x86/")
|
|
target_link_libraries(P7 "ws2_32")
|
|
else()
|
|
target_include_directories(P7 PRIVATE "Shared/Platforms/Linux_x86/")
|
|
endif()
|
|
|
|
if(WIN32)
|
|
set_target_properties(P7 PROPERTIES PREFIX "")
|
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d")
|
|
set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64")
|
|
else()
|
|
set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x32d")
|
|
set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x32")
|
|
endif()
|
|
else()
|
|
set_target_properties(P7 PROPERTIES PREFIX "lib")
|
|
set_target_properties(P7 PROPERTIES POSTFIX "")
|
|
set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "d")
|
|
endif()
|
|
|
|
install(TARGETS P7
|
|
RUNTIME DESTINATION "bin"
|
|
ARCHIVE DESTINATION "lib"
|
|
LIBRARY DESTINATION "lib")
|
|
|
|
install(DIRECTORY Headers/
|
|
DESTINATION include/P7
|
|
FILES_MATCHING PATTERN "*.h")
|