Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[eigen3] Use upstream branch 3.4, instead of master #262

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,8 @@ stages:
matrix: # https://github.com/android/ndk/releases
arm64_ndk27:
vcpkg.default.triplet: "arm64-android"
android.ndk.home: "/usr/local/lib/android/sdk/ndk/27.0.12077973"
x64_ndk27:
vcpkg.default.triplet: "x64-android"
android.ndk.home: "/usr/local/lib/android/sdk/ndk/27.0.12077973"
steps:
- powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
- task: Cache@2
Expand Down
21 changes: 10 additions & 11 deletions ports/eigen3/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
vcpkg_buildpath_length_warning(37)
vcpkg_buildpath_length_warning(40)

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO libeigen/eigen
REF ddb163ffb1d39cab299a584f2965007b6d7e755d
SHA512 e30adf2b0f5faa6fe5d22d3d22311933415f267db758b4a895d3a2917313bb138b26983c7763612e22e05271f5dc7b4b0ad7c4bc44dff065ca5c619a863357d1
HEAD_REF master
REF 9df21dc8b4b576a7aa5c0094daa8d7e8b8be60f0
SHA512 c79724f5e0a97f9e96601248acab804fb5e7bda77f6c05d1b6b933b60c35d1f644214640bec74bac95104a74677b391624c7e0cc202ec2759ba74170bd5d34e8
HEAD_REF 3.4
)
# check ${SOURCE_PATH}/Eigen/src/Core/Util/Macros.h
# EIGEN_WORLD_VERSION, EIGEN_MAJOR_VERSION, EIGEN_MINOR_VERSION

if(VCPKG_TARGET_IS_ANDROID)
list(APPEND PLATFORM_OPTIONS -DCMAKE_Fortran_COMPILER=OFF)
Expand All @@ -17,24 +19,21 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DEIGEN_BUILD_DOC=OFF
-DEIGEN_BUILD_PKGCONFIG=ON
${PLATFORM_OPTIONS}
OPTIONS_RELEASE
-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3
-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}
-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig
OPTIONS_DEBUG
-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/share/eigen3
-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PORT}
-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME Eigen3)
vcpkg_fixup_pkgconfig()

# file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*")
# Copy the eigen header files to conventional location for user-wide MSBuild integration
# file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
Expand Down
2 changes: 1 addition & 1 deletion ports/eigen3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eigen3",
"version-date": "2024-08-01",
"version-semver": "3.4.1-20240316",
"description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.",
"homepage": "https://gitlab.com/libeigen/eigen",
"license": "MPL-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"port-version": 0
},
"eigen3": {
"baseline": "2024-08-01",
"baseline": "3.4.1-20240316",
"port-version": 0
},
"etcpak": {
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/eigen3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a3b523acdb02b74e313795c19fd9557d9716134",
"version-semver": "3.4.1-20240316",
"port-version": 0
},
{
"git-tree": "8af3773883ce3b957bb5fb81bae0cdb7bf7a6b9b",
"version-date": "2024-08-01",
Expand Down
Loading