3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg baseline][many ports] Fix build error (#17983)

Browse Source 
* [vcpkg baseline][wxwidgets] Fix build error

* [mlpack] Fix configure error (upstream bug)

* [vcpkg baseline] [embree2/embree3] Set cmake policy

* Remove control file

* Update baseline version

* [mlpack] Re-write the dependency

* [mlpack] Remove dependency boost-test since only feature test need it, add more boost dependencies.

* [mlpack] Add dependency boost-heap

* [mlpack] Fix uwp build

* update version record

* [mlpack] Revert uwp fix

* update version record

* [mlpack] Remove dependency boost-test

* update version record

* update baseline

* [clamav] Update hash

* update version record

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
This commit is contained in:
Jack·Boos·Yu 2021-05-20 05:05:43 +08:00 committed by GitHub
parent 3738723dd2
commit c99dc50be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 160 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/clamav/portfile.cmake
View File

@ -5,7 +5,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Cisco-Talos/clamav-devel
REF clamav-0.103.0
SHA512 488381202bdcea812c39d611e0a31eaf8f55c9c5d0a6400fd53dfa0da674a95672fdc9b290dc6157cb8f628d9f81846b5cc108eb1e44f6207d3c6f2659ba63c6
SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a
FILE_DISAMBIGUATOR 1
HEAD_REF master
PATCHES
"build.patch"

2
ports/clamav/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "clamav",
"version-semver": "0.103.0",
"port-version": 1,
"port-version": 2,
"description": "ClamAV is an open-source anti-virus toolkit.",
"homepage": "https://www.clamav.net",
"supports": "!uwp & !static",

5
ports/embree2/CONTROL
View File

@ -1,5 +0,0 @@
Source: embree2
Version: 2.17.7
Homepage: https://github.com/embree/embree
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb

14
ports/embree2/cmake_policy.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index afa704d..96dc4f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,9 @@ IF(COMMAND cmake_policy)
if (POLICY CMP0042)
cmake_policy(SET CMP0042 OLD)
endif()
+ if (POLICY CMP0001)
+ cmake_policy(SET CMP0001 OLD)
+ endif()
ENDIF(COMMAND cmake_policy)
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

2
ports/embree2/portfile.cmake
View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF v2.17.7
SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873
HEAD_REF devel2
PATCHES
cmake_policy.patch
)
file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)

10
ports/embree2/vcpkg.json Normal file
View File

@ -0,0 +1,10 @@
{
"name": "embree2",
"version-semver": "2.17.7",
"port-version": 1,
"description": "High Performance Ray Tracing Kernels.",
"homepage": "https://github.com/embree/embree",
"dependencies": [
"tbb"
]
}

14
ports/embree3/cmake_policy.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06f49a8..fdaaee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,9 @@ IF(COMMAND cmake_policy)
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
+ if (POLICY CMP0001)
+ cmake_policy(SET CMP0001 OLD)
+ endif()
ENDIF(COMMAND cmake_policy)
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

1
ports/embree3/portfile.cmake
View File

@ -9,6 +9,7 @@ vcpkg_from_github(
PATCHES
fix-path.patch
fix-static-usage.patch
cmake_policy.patch
)
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB)

3
ports/embree3/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "embree3",
"version": "3.12.2",
"version-semver": "3.12.2",
"port-version": 1,
"description": "High Performance Ray Tracing Kernels.",
"homepage": "https://github.com/embree/embree",
"dependencies": [

9
ports/mlpack/CONTROL
View File

@ -1,9 +0,0 @@
Source: mlpack
Version: 3.4.1
Homepage: https://github.com/mlpack/mlpack
Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
Build-Depends: boost, armadillo, ensmallen, stb
Supports: !uwp
Feature: tools
Description: Build command-line executables.

15
ports/mlpack/fix-configure-error.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMake/go/AppendModel.cmake b/CMake/go/AppendModel.cmake
index eeb28f7..ec50f15 100644
--- a/CMake/go/AppendModel.cmake
+++ b/CMake/go/AppendModel.cmake
@@ -44,8 +44,8 @@ function(append_model SERIALIZATION_FILE PROGRAM_MAIN_FILE)
else ()
string(APPEND GOMODEL_SAFE_TYPE ${MODEL_CHAR})
endif()
- endif()
- endforeach()
+ endforeach()
+ endif()
# See if the model type already exists.
file(READ "${SERIALIZATION_FILE}" SERIALIZATION_FILE_CONTENTS)

24
ports/mlpack/fix-test-dependency.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b59555c..4dd92f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -441,11 +441,18 @@ set(Boost_ADDITIONAL_VERSIONS
set(Boost_NO_BOOST_CMAKE 1)
find_package(Boost "${BOOST_VERSION}"
COMPONENTS
- unit_test_framework
serialization
REQUIRED
)
+if (BUILD_TESTS)
+ find_package(Boost "${BOOST_VERSION}"
+ COMPONENTS
+ unit_test_framework
+ REQUIRED
+ )
+endif()
+
if(0)
link_directories(${Boost_LIBRARY_DIRS})

2
ports/mlpack/portfile.cmake
View File

@ -6,6 +6,8 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
cmakelists.patch
fix-configure-error.patch
fix-test-dependency.patch
)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake)

24
ports/mlpack/vcpkg.json Normal file
View File

@ -0,0 +1,24 @@
{
"name": "mlpack",
"version": "3.4.1",
"port-version": 1,
"description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.",
"homepage": "https://github.com/mlpack/mlpack",
"supports": "uwp",
"dependencies": [
"armadillo",
"boost-heap",
"boost-math",
"boost-program-options",
"boost-random",
"boost-serialization",
"boost-serialization",
"ensmallen",
"stb"
],
"features": {
"tools": {
"description": "Build command-line executables."
}
}
}

15
ports/wxwidgets/fix-build.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
index bd6acd8..b5b5780 100644
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -179,7 +179,9 @@ if(wxBUILD_PRECOMP)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(wxSCINTILLA_PREC_HEADER "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h")
endif()
- wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
+ if (wxSCINTILLA_PREC_HEADER)
+ wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
+ endif()
endif()
wx_add_library(wxstc ${STC_FILES})

1
ports/wxwidgets/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
disable-platform-lib-dir.patch
fix-build.patch
)
set(OPTIONS)

1
ports/wxwidgets/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "wxwidgets",
"version-semver": "3.1.5",
"port-version": 1,
"description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
"homepage": "https://github.com/wxWidgets/wxWidgets",
"supports": "!uwp",

2
scripts/ci.baseline.txt
View File

@ -946,6 +946,8 @@ microsoft-signalr:x64-windows=skip
microsoft-signalr:x64-windows-static=skip
microsoft-signalr:x64-windows-static-md=skip
microsoft-signalr:x86-windows=skip
# https://github.com/mlpack/mlpack/pull/2945
mlpack:x64-uwp=fail
mman:x64-linux=fail
mman:x64-osx=fail
mmloader:arm64-windows=fail

10
versions/baseline.json
View File

@ -1242,7 +1242,7 @@
},
"clamav": {
"baseline": "0.103.0",
"port-version": 1
"port-version": 2
},
"clapack": {
"baseline": "3.2.1",
@ -1838,11 +1838,11 @@
},
"embree2": {
"baseline": "2.17.7",
"port-version": 0
"port-version": 1
},
"embree3": {
"baseline": "3.12.2",
"port-version": 0
"port-version": 1
},
"enet": {
"baseline": "1.3.16",
@ -4006,7 +4006,7 @@
},
"mlpack": {
"baseline": "3.4.1",
"port-version": 0
"port-version": 1
},
"mman": {
"baseline": "git-f5ff813-3",
@ -6514,7 +6514,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
"port-version": 0
"port-version": 1
},
"x-plane": {
"baseline": "3.0.3",

5
versions/c-/clamav.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5580f5bf0e6812edc0e114f55b3377117b5aa6ff",
"version-semver": "0.103.0",
"port-version": 2
},
{
"git-tree": "b6b4287e62ba66791d4f3b1af99f795f7cd8df15",
"version-semver": "0.103.0",

5
versions/e-/embree2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe",
"version-semver": "2.17.7",
"port-version": 1
},
{
"git-tree": "3a87d7af065343c7a78620fa2f432272cb56c117",
"version-string": "2.17.7",

5
versions/e-/embree3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d0b90c66c1c8be2574ff610fe1fda718e8b87b78",
"version-semver": "3.12.2",
"port-version": 1
},
{
"git-tree": "8684283b1251cae5f299462307ff5cac0cf1f4fd",
"version": "3.12.2",

5
versions/m-/mlpack.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b",
"version": "3.4.1",
"port-version": 1
},
{
"git-tree": "ca98fd8ae45d5ef5e77e4f2942b2dbe60a4356d4",
"version-string": "3.4.1",

5
versions/w-/wxwidgets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7",
"version-semver": "3.1.5",
"port-version": 1
},
{
"git-tree": "09e00eb06f1870d88caadf9e5e23719b197deda4",
"version-semver": "3.1.5",