aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Manfred Gruber <bernhardmgruber@gmail.com>2021-03-16 20:13:07 +0100
committerGitHub <noreply@github.com>2021-03-16 12:13:07 -0700
commit9ab3bafca4de5dec5a5a8b60f1d654cae7ad95aa (patch)
tree97e183712a2cbe1844c22ba3ef05458edf1eb508
parent31534bd59bc5587d268012ae14d14c41a508ae81 (diff)
downloadvcpkg-9ab3bafca4de5dec5a5a8b60f1d654cae7ad95aa.tar.gz
vcpkg-9ab3bafca4de5dec5a5a8b60f1d654cae7ad95aa.zip
[vc] Update HEAD_REF and fix CMake configure options (#16552)
* use 1.4 branch of Vc as HEAD_REF * fix options passes to cmake configure * increment port version
-rw-r--r--ports/vc/CONTROL1
-rw-r--r--ports/vc/portfile.cmake5
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/v-/vc.json5
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL
index e56fda2d6..c3962f4b4 100644
--- a/ports/vc/CONTROL
+++ b/ports/vc/CONTROL
@@ -1,5 +1,6 @@
Source: vc
Version: 1.4.1
+Port-Version: 1
Homepage: https://github.com/VcDevel/Vc
Description: SIMD Vector Classes for C++ .
Supports: !arm64
diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake
index b5b0da5fb..7853834d1 100644
--- a/ports/vc/portfile.cmake
+++ b/ports/vc/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
REPO VcDevel/Vc
REF 1.4.1
SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
- HEAD_REF master
+ HEAD_REF 1.4
PATCHES
"correct_cmake_config_path.patch"
)
@@ -13,8 +13,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- -DBUILD_TESTING=OFF
- -DBUILD_EXAMPLES=OFF
+ OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Vc/)
diff --git a/versions/baseline.json b/versions/baseline.json
index b9407e0d4..647809c79 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6126,7 +6126,7 @@
},
"vc": {
"baseline": "1.4.1",
- "port-version": 0
+ "port-version": 1
},
"vcglib": {
"baseline": "1.0.1",
diff --git a/versions/v-/vc.json b/versions/v-/vc.json
index 07bdc23f0..8777c912d 100644
--- a/versions/v-/vc.json
+++ b/versions/v-/vc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1ab229fb781ff549e05917c4ec46a1fcd6bd1a3a",
+ "version-string": "1.4.1",
+ "port-version": 1
+ },
+ {
"git-tree": "62edb04d91a2e37739c935e832dfa75f311089f8",
"version-string": "1.4.1",
"port-version": 0