From f83260979b7078b9b4002ba6aec138c3a4fc053f Mon Sep 17 00:00:00 2001 From: PARK DongHa Date: Tue, 17 Sep 2024 02:42:07 +0900 Subject: [PATCH] [eigen3] Disable Fortran in iOS build (#267) * [eigen3] disable Fortran in iOS build * [eigen3] update baseline --- ports/eigen3/portfile.cmake | 14 +++++--------- ports/eigen3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/eigen3.json | 5 +++++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index acd9f06f..0ac042ae 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_gitlab( HEAD_REF master ) -if(VCPKG_TARGET_IS_ANDROID) +if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS) list(APPEND PLATFORM_OPTIONS -DCMAKE_Fortran_COMPILER=OFF) endif() @@ -17,24 +17,20 @@ 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" diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json index 78de0fea..c1cfc09a 100644 --- a/ports/eigen3/vcpkg.json +++ b/ports/eigen3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "eigen3", "version-date": "2024-08-01", + "port-version": 1, "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", "homepage": "https://gitlab.com/libeigen/eigen", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a790e72b..ad2b853e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -42,7 +42,7 @@ }, "eigen3": { "baseline": "2024-08-01", - "port-version": 0 + "port-version": 1 }, "etcpak": { "baseline": "2.0", diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 8b4425f5..6405d4cd 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a319e8668f5e0829011e62a86d0168d555e3841d", + "version-date": "2024-08-01", + "port-version": 1 + }, { "git-tree": "8af3773883ce3b957bb5fb81bae0cdb7bf7a6b9b", "version-date": "2024-08-01",