From 5938bf830284f9821376445a376dacf1fd7c48df Mon Sep 17 00:00:00 2001 From: Alexander Puzicha <44292150+FlyingdutchmanC@users.noreply.github.com> Date: Thu, 17 Dec 2020 09:14:31 +0100 Subject: [PATCH] [eigen3] update to 3.3.9 (#15022) --- ports/eigen3/CONTROL | 3 +-- ...disable_pkgconfig_absolute_path_check.patch | 18 ++++++++++++++++++ ports/eigen3/portfile.cmake | 8 +++++--- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 ports/eigen3/disable_pkgconfig_absolute_path_check.patch diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index f1180da665..e285c62d28 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,5 +1,4 @@ Source: eigen3 -Version: 3.3.7 -Port-Version: 8 +Version: 3.3.9 Homepage: http://eigen.tuxfamily.org Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/disable_pkgconfig_absolute_path_check.patch b/ports/eigen3/disable_pkgconfig_absolute_path_check.patch new file mode 100644 index 0000000000..cfa9643405 --- /dev/null +++ b/ports/eigen3/disable_pkgconfig_absolute_path_check.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbb9bcf..84c413c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -407,11 +407,13 @@ set(PKGCONFIG_INSTALL_DIR + CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" + ) + ++if(0) + foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + if(IS_ABSOLUTE "${${var}}") + message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") + endif() + endforeach() ++endif() + + # similar to set_target_properties but append the property instead of overwriting it + macro(ei_add_target_property target prop value) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4fc9c7cc39..4b1a74f9eb 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,10 +4,12 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 3.3.7 - SHA512 4cc3717b9cbe78335e05f724919497214edd482d4812aeb1a9fd6da5b3f6d1b194bb93ed0dab9e734b4334a5b88e8f8c339c43c1b2044332286ef5e758f9ecf4 + REF 3.3.9 + SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46 HEAD_REF master - PATCHES fix-cuda-error.patch # issue https://gitlab.com/libeigen/eigen/-/issues/1526 + PATCHES + disable_pkgconfig_absolute_path_check.patch + fix-cuda-error.patch # issue https://gitlab.com/libeigen/eigen/-/issues/1526 ) vcpkg_configure_cmake(