mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 01:24:47 +08:00
[Many Ports] Baseline Fixes for 2020-10-24 CI Build (#14208)
* [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
This commit is contained in:
Billy O'Neal
GitHub
parent
2f731d650f
commit
b97849d258
@ -1,5 +1,6 @@
|
||||
Source: akali
|
||||
Version: 1.42
|
||||
Port-Version: 1
|
||||
Description: C++ Common Library.
|
||||
Homepage: https://github.com/winsoft666/akali
|
||||
Supports: !(arm|arm64|uwp)
|
||||
Supports: !(arm|arm64|uwp)
|
||||
|
||||
@ -13,6 +13,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DAKALI_STATIC:BOOL=${AKALI_STATIC}
|
||||
-DBUILD_TESTS:BOOL=OFF
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: ignition-modularscripts
|
||||
Version: 2020-05-16
|
||||
Port-Version: 1
|
||||
Port-Version: 2
|
||||
Description: Vcpkg helpers to package ignition libraries
|
||||
|
||||
@ -3,6 +3,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS -DBUILD_TESTING=OFF
|
||||
)
|
||||
|
||||
@ -29,13 +30,13 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
|
||||
file(COPY ${CMAKE_RELEASE_FILES} DESTINATION
|
||||
"${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/")
|
||||
endif()
|
||||
|
||||
|
||||
# Remove unused files files
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake
|
||||
${CURRENT_PACKAGES_DIR}/debug/include
|
||||
${CURRENT_PACKAGES_DIR}/debug/lib/cmake
|
||||
${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
|
||||
# Make pkg-config files relocatable
|
||||
if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
|
||||
if(VCPKG_TARGET_IS_LINUX)
|
||||
@ -97,7 +98,7 @@ endfunction()
|
||||
## ### CMAKE_PACKAGE_NAME
|
||||
## The name of the CMake package for the port.
|
||||
## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}`.
|
||||
##
|
||||
##
|
||||
## ### DISABLE_PKGCONFIG_INSTALL
|
||||
## If present, disable installation of .pc pkg-config configuration files.
|
||||
##
|
||||
@ -112,16 +113,16 @@ function(ignition_modular_library)
|
||||
set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME)
|
||||
set(multiValueArgs PATCHES)
|
||||
cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
|
||||
string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION})
|
||||
list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION)
|
||||
|
||||
# If the REF option is omitted, use the canonical one
|
||||
# If the REF option is omitted, use the canonical one
|
||||
if(NOT DEFINED IML_REF)
|
||||
set(IML_REF "ignition-${IML_NAME}${IML_MAJOR_VERSION}_${IML_VERSION}")
|
||||
endif()
|
||||
|
||||
# If the HEAD_REF option is omitted, use the canonical one
|
||||
|
||||
# If the HEAD_REF option is omitted, use the canonical one
|
||||
if(NOT DEFINED IML_HEAD_REF)
|
||||
set(IML_HEAD_REF "ign-${IML_NAME}${IML_MAJOR_VERSION}")
|
||||
endif()
|
||||
@ -141,7 +142,7 @@ function(ignition_modular_library)
|
||||
HEAD_REF ${IML_HEAD_REF}
|
||||
PATCHES ${IML_PATCHES}
|
||||
)
|
||||
|
||||
|
||||
# Build library
|
||||
ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL})
|
||||
endfunction()
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
Source: ignition-msgs1
|
||||
Version: 1.0.0-1
|
||||
Version: 1.0.0
|
||||
Port-Version: 2
|
||||
Build-Depends: ignition-cmake0, ignition-math4, protobuf
|
||||
Description: Middleware protobuf messages for robotics
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
|
||||
|
||||
# Explicitly disable cross-compilation until the upstream discussion
|
||||
|
||||
@ -13,6 +13,7 @@ vcpkg_from_github(
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
-DKNET_BUILD_EXAMPLE:BOOL=OFF
|
||||
-DKNET_BUILD_TEST:BOOL=OFF
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "knet",
|
||||
"version-string": "1.0.1",
|
||||
"port-version": 1,
|
||||
"description": "A cross platform lock-free and timer-supported C++11 network library.",
|
||||
"homepage": "https://github.com/kibaamor/knet",
|
||||
"license": "MIT",
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
Source: libnice
|
||||
Version: 0.1.15-4
|
||||
Version: 0.1.15
|
||||
Port-Version: 5
|
||||
Homepage: https://nice.freedesktop.org
|
||||
Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).
|
||||
Build-Depends: glib, openssl
|
||||
|
||||
@ -14,6 +14,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS_RELEASE -DOPTIMIZE=1
|
||||
OPTIONS_DEBUG -DDEBUGGABLE=1
|
||||
)
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
Source: libp7-baical
|
||||
Version: 4.4
|
||||
Port-Version: 5
|
||||
Homepage: https://baical.net/
|
||||
Description: P7 is a library for high-speed sending telemetry & trace data from application
|
||||
Supports: !(arm|uwp|osx)
|
||||
Version: replaced
|
||||
Build-Depends: libp7client
|
||||
Description: An old name for the port libp7client; please install libp7client instead.
|
||||
|
||||
@ -1,30 +1,2 @@
|
||||
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
|
||||
|
||||
set(LIBP7_VERSION 4.4)
|
||||
set(LIBP7_HASH 500fefdf6fb01999ddb2accc8309cf8749fb7a65abb98faaf6d71a5ae3da4eac8c00c083905b01f7f6cc973387b605f2c4db0bb007562f76b7ad43b6abe2b91f)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://baical.net/files/libP7_v${LIBP7_VERSION}.zip"
|
||||
FILENAME "libP7_v${LIBP7_VERSION}.zip"
|
||||
SHA512 ${LIBP7_HASH}
|
||||
)
|
||||
|
||||
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)
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
message(WARNING "libp7-baical has been replaced by libp7client.")
|
||||
|
||||
@ -1,24 +1,17 @@
|
||||
project(P7)
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
cmake_minimum_required(VERSION 3.18)
|
||||
|
||||
set(SOURCES "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"
|
||||
)
|
||||
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")
|
||||
|
||||
if(WIN32)
|
||||
set(RESOURCES "Sources/P7Client.rc")
|
||||
else()
|
||||
set(RESOURCES "")
|
||||
endif()
|
||||
|
||||
add_library(P7 "${SOURCES}" "${RESOURCES}")
|
||||
target_include_directories(P7 PRIVATE "Headers/")
|
||||
target_include_directories(P7 PRIVATE "Shared/")
|
||||
if(WIN32)
|
||||
@ -30,7 +23,7 @@ endif()
|
||||
|
||||
if(WIN32)
|
||||
set_target_properties(P7 PROPERTIES PREFIX "")
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d")
|
||||
set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64")
|
||||
else()
|
||||
@ -45,9 +38,9 @@ endif()
|
||||
|
||||
install(TARGETS P7
|
||||
RUNTIME DESTINATION "bin"
|
||||
ARCHIVE DESTINATION "lib"
|
||||
ARCHIVE DESTINATION "lib"
|
||||
LIBRARY DESTINATION "lib")
|
||||
|
||||
install(DIRECTORY Headers/
|
||||
|
||||
install(DIRECTORY Headers/
|
||||
DESTINATION include/P7
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
@ -1,4 +1,5 @@
|
||||
Source: libp7client
|
||||
Version: 5.2-1
|
||||
Version: 5.6
|
||||
Homepage: https://baical.net/
|
||||
Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.
|
||||
Supports: x86|x64
|
||||
Supports: !(arm|uwp|osx)
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
diff --git a/Sources/P7ClientDll.vcxproj b/Sources/P7ClientDll.vcxproj
|
||||
index 9fab3d0..a7035d9 100644
|
||||
--- a/Sources/P7ClientDll.vcxproj
|
||||
+++ b/Sources/P7ClientDll.vcxproj
|
||||
@@ -112,7 +112,7 @@
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ShowIncludes>false</ShowIncludes>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -137,7 +137,7 @@
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -165,7 +165,7 @@
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
+ <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -195,7 +195,7 @@
|
||||
<PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
+ <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
diff --git a/Sources/P7ClientLib.vcxproj b/Sources/P7ClientLib.vcxproj
|
||||
index 3b46bab..725f8a4 100644
|
||||
--- a/Sources/P7ClientLib.vcxproj
|
||||
+++ b/Sources/P7ClientLib.vcxproj
|
||||
@@ -161,6 +161,7 @@
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ShowIncludes>false</ShowIncludes>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -181,6 +182,7 @@
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -204,6 +206,7 @@
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -255,6 +258,7 @@
|
||||
<PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -1,118 +1,27 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
|
||||
message(FATAL_ERROR "Unsupported system: ${VCPKG_CMAKE_SYSTEM_NAME}")
|
||||
endif()
|
||||
|
||||
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(BUILD_ARCH "Win32")
|
||||
set(ARCH "32")
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
set(BUILD_ARCH "x64")
|
||||
set(ARCH "64")
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
||||
endif()
|
||||
|
||||
set(VERSION 5.2)
|
||||
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://baical.net/files/libP7Client_v${VERSION}.zip"
|
||||
FILENAME "libP7Client_v${VERSION}.zip"
|
||||
SHA512 9744b9c3f091db90aca3485408d3e1169317152ea353ab3845cd7cfb9d61d105b55be17ad83c5970e01d7d0f37566313bc18c0f8a4c16bcd1582cd7a5ea29b87
|
||||
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}
|
||||
ARCHIVE "${ARCHIVE}"
|
||||
NO_REMOVE_ONE_LEVEL
|
||||
REF ${VERSION}
|
||||
PATCHES
|
||||
"fix-runtime-library.patch"
|
||||
)
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientLib.vcxproj
|
||||
PLATFORM ${BUILD_ARCH}
|
||||
RELEASE_CONFIGURATION
|
||||
DEBUG_CONFIGURATION
|
||||
OPTIONS
|
||||
"/p:NoWarn=C4996"
|
||||
)
|
||||
|
||||
file(GLOB LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.lib")
|
||||
file(GLOB D_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.lib")
|
||||
else()
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientDll.vcxproj
|
||||
PLATFORM ${BUILD_ARCH}
|
||||
#RELEASE_CONFIGURATION
|
||||
#DEBUG_CONFIGURATION
|
||||
OPTIONS
|
||||
"/p:NoWarn=C4996"
|
||||
)
|
||||
|
||||
file(GLOB DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll.lib")
|
||||
file(GLOB D_DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll.lib")
|
||||
|
||||
file(GLOB DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll")
|
||||
file(GLOB D_DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll")
|
||||
|
||||
file(GLOB PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.pdb")
|
||||
file(GLOB D_PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.pdb")
|
||||
|
||||
endif()
|
||||
|
||||
file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Headers/*.h")
|
||||
file(INSTALL
|
||||
${HEADER_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include/P7
|
||||
)
|
||||
|
||||
#file(GLOB EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.exe")
|
||||
#file(GLOB D_EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.exe")
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
|
||||
file(INSTALL
|
||||
${LIB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${D_LIB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${DLL_LIB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${D_DLL_LIB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${DLL_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
|
||||
)
|
||||
file(INSTALL
|
||||
${D_DLL_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
|
||||
)
|
||||
file(INSTALL
|
||||
${PDB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
|
||||
)
|
||||
file(INSTALL
|
||||
${D_PDB_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7client RENAME copyright)
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
endif()
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
Source: nvtt
|
||||
Version: 2.1.2
|
||||
Port-Version: 1
|
||||
Homepage: https://github.com/castano/nvidia-texture-tools
|
||||
Description: Texture processing tools with support for Direct3D 10 and 11 formats.
|
||||
Supports: !x86
|
||||
Build-Depends: libsquish
|
||||
|
||||
@ -15,6 +15,7 @@ vcpkg_from_github(
|
||||
squish.patch
|
||||
fix-build-error.patch
|
||||
add-compile-options-for-osx.patch
|
||||
skip-building-libsquish.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
@ -38,4 +39,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
# Handle copyright
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
13
ports/nvtt/skip-building-libsquish.patch
Normal file
13
ports/nvtt/skip-building-libsquish.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
|
||||
index 911c19e..6f13de4 100644
|
||||
--- a/extern/CMakeLists.txt
|
||||
+++ b/extern/CMakeLists.txt
|
||||
@@ -5,7 +5,6 @@ ADD_SUBDIRECTORY(EtcLib)
|
||||
ADD_SUBDIRECTORY(rg_etc1_v104)
|
||||
#ADD_SUBDIRECTORY(etcpack)
|
||||
|
||||
-ADD_SUBDIRECTORY(libsquish-1.15)
|
||||
+#ADD_SUBDIRECTORY(libsquish-1.15)
|
||||
|
||||
ADD_SUBDIRECTORY(CMP_Core)
|
||||
-
|
||||
@ -380,7 +380,6 @@ farmhash:x64-windows-static=fail
|
||||
farmhash:x86-windows=fail
|
||||
fastrtps:arm-uwp=fail
|
||||
fastrtps:x64-linux=fail
|
||||
fastrtps:x64-osx=fail
|
||||
fastrtps:x64-uwp=fail
|
||||
fastrtps:x64-windows-static=fail
|
||||
fdk-aac:arm64-windows=fail
|
||||
@ -747,11 +746,6 @@ libosip2:x64-uwp=fail
|
||||
libosip2:x64-windows=fail
|
||||
libosip2:x64-windows-static=fail
|
||||
libosip2:x86-windows=fail
|
||||
libp7client:arm64-windows=fail
|
||||
libp7client:arm-uwp=fail
|
||||
libp7client:x64-linux=fail
|
||||
libp7client:x64-osx=fail
|
||||
libp7client:x64-uwp=fail
|
||||
libpcap:arm64-windows=fail
|
||||
libpcap:arm-uwp=fail
|
||||
libpcap:x64-osx=fail
|
||||
@ -1053,7 +1047,6 @@ nana:x64-linux=fail
|
||||
nana:x64-osx=fail
|
||||
nana:x64-uwp=fail
|
||||
nanodbc:arm-uwp=fail
|
||||
nanodbc:x64-osx=fail
|
||||
nanodbc:x64-uwp=fail
|
||||
nanodbc:x64-linux=skip
|
||||
nanogui:arm64-windows=fail
|
||||
@ -1073,7 +1066,6 @@ nethost:x64-uwp=fail
|
||||
nethost:arm-uwp=fail
|
||||
nettle:x64-windows-static=skip
|
||||
nettle:x64-windows=skip
|
||||
nettle:x64-osx=fail
|
||||
networkdirect-sdk:arm64-windows=fail
|
||||
networkdirect-sdk:arm-uwp=fail
|
||||
networkdirect-sdk:x64-linux=fail
|
||||
@ -1210,8 +1202,6 @@ openssl-windows:x64-osx=fail
|
||||
openssl-windows:x64-uwp=fail
|
||||
opentracing:arm-uwp=fail
|
||||
opentracing:x64-uwp=fail
|
||||
openvdb:x64-osx=fail
|
||||
#openvdb:x64-windows-static=fail # https://github.com/microsoft/vcpkg/pull/10816#issuecomment-613784827
|
||||
openvpn3:x64-osx=fail
|
||||
openvr:arm64-windows=fail
|
||||
openvr:arm-uwp=fail
|
||||
|
||||
Loading…
Reference in New Issue
Block a user