From d004f3d4dec68d7ddf0cb89aebe3013fae6c898f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 3 Apr 2024 08:31:39 +0000 Subject: [PATCH 01/28] remvoe from faillist --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e88955b01536f9..6f9440a8f4ad32 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1128,9 +1128,6 @@ thorvg:arm-neon-android=fail tinycthread:arm-neon-android=fail tinycthread:arm64-android=fail tinycthread:x64-android=fail -tlx:arm-neon-android=fail -tlx:arm64-android=fail -tlx:x64-android=fail torch-th:arm-neon-android=fail torch-th:arm64-android=fail torch-th:arm64-windows=fail From 402871e9aa1da1f569dcd45e604d5b9b3142e7b3 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 3 Apr 2024 08:36:30 +0000 Subject: [PATCH 02/28] Revert "remvoe from faillist" This reverts commit d004f3d4dec68d7ddf0cb89aebe3013fae6c898f. --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6f9440a8f4ad32..e88955b01536f9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1128,6 +1128,9 @@ thorvg:arm-neon-android=fail tinycthread:arm-neon-android=fail tinycthread:arm64-android=fail tinycthread:x64-android=fail +tlx:arm-neon-android=fail +tlx:arm64-android=fail +tlx:x64-android=fail torch-th:arm-neon-android=fail torch-th:arm64-android=fail torch-th:arm64-windows=fail From 59af43bab597a3e8e5c4238fbb43b54ee9d93476 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 8 Apr 2024 06:51:56 +0000 Subject: [PATCH 03/28] fix lapack.lib not found --- ports/lapack-reference/portfile.cmake | 12 ++---------- ports/lapack-reference/usage | 5 ----- ports/lapack-reference/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 1eb3401e9d1ac5..f5f994c71f709e 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -77,7 +77,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${VERSION} CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? +vcpkg_cmake_config_fixup(PACKAGE_NAME lapack CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") @@ -124,12 +124,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") - endif() if(NOT USE_OPTIMIZED_BLAS) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") @@ -140,8 +134,6 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lapack-reference/usage b/ports/lapack-reference/usage index a181a075f96591..2139ae447d6a57 100644 --- a/ports/lapack-reference/usage +++ b/ports/lapack-reference/usage @@ -2,8 +2,3 @@ lapack-reference provides CMake targets: find_package(lapack CONFIG REQUIRED) target_link_libraries(main PRIVATE lapack) - -lapack-reference is compatible with built-in CMake targets: - - find_package(LAPACK REQUIRED) - target_link_libraries(main PRIVATE LAPACK::LAPACK) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index 6f30ae7a6a5b01..62d40ac28d6d59 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", - "port-version": 2, + "port-version": 3, "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", From 33770970b07536f3fa2c6e968dfcb72a75c07e0f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 8 Apr 2024 06:53:23 +0000 Subject: [PATCH 04/28] update version --- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5db40a273ec268..469eff7a171885 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4058,7 +4058,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 2 + "port-version": 3 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 1cd14ec48e6144..9bf1b4199968be 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb5342a15e3cde70b0f762167e6fa483b2dd0765", + "version": "3.11.0", + "port-version": 3 + }, { "git-tree": "34ccaaa835e90fc739829db6ea9b72c58151960e", "version": "3.11.0", From 24661456c40559c8ce62780d9388bf4d6d64b82c Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:33:02 +0000 Subject: [PATCH 05/28] fix config file --- ports/lapack-reference/portfile.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index f5f994c71f709e..9883f4a6536bc5 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -124,6 +124,16 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-release.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) if(NOT USE_OPTIMIZED_BLAS) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") From d96bb18cc69f8d78dbd7f5cb35b60c19e475f34d Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:33:51 +0000 Subject: [PATCH 06/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 9bf1b4199968be..e4f3a00bdb2f9f 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb5342a15e3cde70b0f762167e6fa483b2dd0765", + "git-tree": "c122465985ceb2ce078d12a96e8317fa70735ae5", "version": "3.11.0", "port-version": 3 }, From 4bff5ef199ad157d02023027331c574edd74f854 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:38:26 +0000 Subject: [PATCH 07/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index e4f3a00bdb2f9f..88aaadefb68e2e 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c122465985ceb2ce078d12a96e8317fa70735ae5", + "git-tree": "5d9c79899a89dd18d67615b93c8d0518c5989a2b", "version": "3.11.0", "port-version": 3 }, From f2d77c2b546fa2ca94398b8ef7d35e329db6e824 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:44:19 +0000 Subject: [PATCH 08/28] update version --- ports/lapack-reference/vcpkg.json | 2 +- versions/l-/lapack-reference.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index fbd3cb8313abbf..9e751d7546d2fe 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", - "port-version": 3, + "port-version": 4, "description": "LAPACK - Linear Algebra PACKage", "homepage": "https://netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 88aaadefb68e2e..fa6b0a81d2ca2b 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5d9c79899a89dd18d67615b93c8d0518c5989a2b", + "git-tree": "415dc49800a66d2b211f2d16326d0bdfa1b2e665", "version": "3.11.0", "port-version": 3 }, From 62e7fbcbe03066cc42e0769418794ae07f8a3a22 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:44:41 +0000 Subject: [PATCH 09/28] update version --- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index bf11c3edfe964b..eb9b6e377524e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4062,7 +4062,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 3 + "port-version": 4 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index fa6b0a81d2ca2b..ee5716eea9c0c4 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aaf48ae6cf61c3139a2f061a84e74d438440b80", + "version": "3.11.0", + "port-version": 4 + }, { "git-tree": "415dc49800a66d2b211f2d16326d0bdfa1b2e665", "version": "3.11.0", From 3aeecf93e6941923f206fce7d89fd38944a3b5fa Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:51:10 +0000 Subject: [PATCH 10/28] modify config --- ports/lapack-reference/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 9883f4a6536bc5..8a2395490d2a39 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -144,6 +144,8 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() +#file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") +#file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 45d345262b4adea7080ee64570f4ae9b958b332a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:51:36 +0000 Subject: [PATCH 11/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index ee5716eea9c0c4..e35481213ab0de 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7aaf48ae6cf61c3139a2f061a84e74d438440b80", + "git-tree": "227982a2690753e6f7e30ff3aca44354d60e9650", "version": "3.11.0", "port-version": 4 }, From 4b0c87518ba165455b886f51db3177ae6980feab Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:57:41 +0000 Subject: [PATCH 12/28] \r --- ports/lapack-reference/portfile.cmake | 302 +++++++++++++------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 8a2395490d2a39..7b00f5208b4029 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -1,151 +1,151 @@ -#TODO: Features to add: -# USE_XBLAS??? extended precision blas. needs xblas -# LAPACKE should be its own PORT -# USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?) -# LAPACKE Builds LAPACKE -# LAPACKE_WITH_TMG Build LAPACKE with tmglib routines -if(EXISTS "${CURRENT_INSTALLED_DIR}/share/clapack/copyright") - message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() - -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - -include(vcpkg_find_fortran) -SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "Reference-LAPACK/lapack" - REF "v${VERSION}" - SHA512 fc3258b9d91a833149a68a89c5589b5113e90a8f9f41c3a73fbfccb1ecddd92d9462802c0f870f1c3dab392623452de4ef512727f5874ffdcba6a4845f78fc9a - HEAD_REF master - PATCHES - cmake-config.patch - lapacke.patch -) - -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(ENV{FFLAGS} "$ENV{FFLAGS} -fPIC") -endif() - -set(CBLAS OFF) -if("cblas" IN_LIST FEATURES) - set(CBLAS ON) - if("noblas" IN_LIST FEATURES) - message(FATAL_ERROR "Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas!") - endif() -endif() - -set(USE_OPTIMIZED_BLAS OFF) -if("noblas" IN_LIST FEATURES) - set(USE_OPTIMIZED_BLAS ON) - set(pcfile "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() - set(pcfile "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() -endif() - -set(VCPKG_CRT_LINKAGE_BACKUP ${VCPKG_CRT_LINKAGE}) -vcpkg_find_fortran(FORTRAN_CMAKE) -if(VCPKG_USE_INTERNAL_Fortran) - if(VCPKG_CRT_LINKAGE_BACKUP STREQUAL "static") - # If openblas has been built with static crt linkage we cannot use it with gfortran! - set(USE_OPTIMIZED_BLAS OFF) - #Cannot use openblas from vcpkg if we are building with gfortran here. - if("noblas" IN_LIST FEATURES) - message(FATAL_ERROR "Feature 'noblas' cannot be used without supplying an external fortran compiler") - endif() - endif() -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" - "-DCMAKE_REQUIRE_FIND_PACKAGE_BLAS=${USE_OPTIMIZED_BLAS}" - "-DCBLAS=${CBLAS}" - "-DTEST_FORTRAN_COMPILER=OFF" - ${FORTRAN_CMAKE} - MAYBE_UNUSED_VARIABLES - CMAKE_REQUIRE_FIND_PACKAGE_BLAS -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME lapack CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? - -set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") -if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") -endif() -set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc") -if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") -endif() -if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") - if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") - endif() - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc") - if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") - endif() -endif() -if("cblas" IN_LIST FEATURES) - set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc") - if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") - endif() - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc") - if(EXISTS "${pcfile}") - file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") - endif() -endif() -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-release.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - if(NOT USE_OPTIMIZED_BLAS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/blas.lib") - endif() - endif() -endif() - -#file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") -#file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +#TODO: Features to add: +# USE_XBLAS??? extended precision blas. needs xblas +# LAPACKE should be its own PORT +# USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?) +# LAPACKE Builds LAPACKE +# LAPACKE_WITH_TMG Build LAPACKE with tmglib routines +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/clapack/copyright") + message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} + +include(vcpkg_find_fortran) +SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "Reference-LAPACK/lapack" + REF "v${VERSION}" + SHA512 fc3258b9d91a833149a68a89c5589b5113e90a8f9f41c3a73fbfccb1ecddd92d9462802c0f870f1c3dab392623452de4ef512727f5874ffdcba6a4845f78fc9a + HEAD_REF master + PATCHES + cmake-config.patch + lapacke.patch +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(ENV{FFLAGS} "$ENV{FFLAGS} -fPIC") +endif() + +set(CBLAS OFF) +if("cblas" IN_LIST FEATURES) + set(CBLAS ON) + if("noblas" IN_LIST FEATURES) + message(FATAL_ERROR "Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas!") + endif() +endif() + +set(USE_OPTIMIZED_BLAS OFF) +if("noblas" IN_LIST FEATURES) + set(USE_OPTIMIZED_BLAS ON) + set(pcfile "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openblas.pc") + if(EXISTS "${pcfile}") + file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) + endif() + set(pcfile "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/openblas.pc") + if(EXISTS "${pcfile}") + file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) + endif() +endif() + +set(VCPKG_CRT_LINKAGE_BACKUP ${VCPKG_CRT_LINKAGE}) +vcpkg_find_fortran(FORTRAN_CMAKE) +if(VCPKG_USE_INTERNAL_Fortran) + if(VCPKG_CRT_LINKAGE_BACKUP STREQUAL "static") + # If openblas has been built with static crt linkage we cannot use it with gfortran! + set(USE_OPTIMIZED_BLAS OFF) + #Cannot use openblas from vcpkg if we are building with gfortran here. + if("noblas" IN_LIST FEATURES) + message(FATAL_ERROR "Feature 'noblas' cannot be used without supplying an external fortran compiler") + endif() + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" + "-DCMAKE_REQUIRE_FIND_PACKAGE_BLAS=${USE_OPTIMIZED_BLAS}" + "-DCBLAS=${CBLAS}" + "-DTEST_FORTRAN_COMPILER=OFF" + ${FORTRAN_CMAKE} + MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_BLAS +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME lapack CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") +endif() +if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() +endif() +if("cblas" IN_LIST FEATURES) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_TARGET_IS_WINDOWS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-release.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) + if(NOT USE_OPTIMIZED_BLAS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/blas.lib") + endif() + endif() +endif() + +#file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") +#file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 5669193cee97714cde6bf69191638620cb651c7a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 07:58:00 +0000 Subject: [PATCH 13/28] up --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index e35481213ab0de..c8ab846bcd4f53 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "227982a2690753e6f7e30ff3aca44354d60e9650", + "git-tree": "4be8bad228271fd3ccfccc46b295e1265a1bfee3", "version": "3.11.0", "port-version": 4 }, From 1fe36ee724863f548dcc37416ed3a1b0866c39c9 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 08:03:03 +0000 Subject: [PATCH 14/28] update usage --- ports/lapack-reference/usage | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/lapack-reference/usage b/ports/lapack-reference/usage index 2139ae447d6a57..a181a075f96591 100644 --- a/ports/lapack-reference/usage +++ b/ports/lapack-reference/usage @@ -2,3 +2,8 @@ lapack-reference provides CMake targets: find_package(lapack CONFIG REQUIRED) target_link_libraries(main PRIVATE lapack) + +lapack-reference is compatible with built-in CMake targets: + + find_package(LAPACK REQUIRED) + target_link_libraries(main PRIVATE LAPACK::LAPACK) From 6282fa31a91705576211ade7d5596fb06b4172e2 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 08:03:20 +0000 Subject: [PATCH 15/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index c8ab846bcd4f53..961d752a6247b3 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4be8bad228271fd3ccfccc46b295e1265a1bfee3", + "git-tree": "21c852cc31bb1ce5480c080deb438e6eb68e04f5", "version": "3.11.0", "port-version": 4 }, From 6e031c360e4ff9dd002f09718eda92893380ad9a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 08:08:33 +0000 Subject: [PATCH 16/28] modify portfile --- ports/lapack-reference/portfile.cmake | 58 ++++++++++++++++----------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 7b00f5208b4029..5b1aa50d226b98 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_from_github( ) if(NOT VCPKG_TARGET_IS_WINDOWS) - set(ENV{FFLAGS} "$ENV{FFLAGS} -fPIC") + set(ENV{FFLAGS} "$ENV{FFLAGS} -fPIC") # should come from toolchain endif() set(CBLAS OFF) @@ -40,14 +40,6 @@ endif() set(USE_OPTIMIZED_BLAS OFF) if("noblas" IN_LIST FEATURES) set(USE_OPTIMIZED_BLAS ON) - set(pcfile "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() - set(pcfile "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/openblas.pc") - if(EXISTS "${pcfile}") - file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) - endif() endif() set(VCPKG_CRT_LINKAGE_BACKUP ${VCPKG_CRT_LINKAGE}) @@ -82,45 +74,58 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME lapack CONFIG_PATH lib/cmake/lapack-${VERS set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() + if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() endif() if("cblas" IN_LIST FEATURES) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") endif() set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) - set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") - file(WRITE "${pcfile}" "${_contents}") + file(WRITE "${pcfile}" "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") endif() endif() vcpkg_fixup_pkgconfig() +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack-reference.pc") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack-reference.pc") +endif() + +if(NOT "noblas" IN_LIST FEATURES) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas-reference.pc") + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas-reference.pc") + endif() + if("cblas" IN_LIST FEATURES) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas-reference.pc") + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas-reference.pc") + endif() + endif() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) @@ -144,8 +149,13 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -#file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") -#file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BLA_STATIC ON) +else() + set(BLA_STATIC OFF) +endif() +set(BLA_VENDOR Generic) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From 3492df2cc419e88b803eec115e4173844b7df30f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 9 Apr 2024 08:08:55 +0000 Subject: [PATCH 17/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 961d752a6247b3..95d3f6b67fb4a2 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "21c852cc31bb1ce5480c080deb438e6eb68e04f5", + "git-tree": "717560379269195d63e1b44c2b0d8a86a5793272", "version": "3.11.0", "port-version": 4 }, From d23ef08a9e613163e4c2e0b34d108d5e376496d7 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 11 Apr 2024 08:05:51 +0000 Subject: [PATCH 18/28] update version --- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4daeb8bd5cc1a3..f96fe200719304 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4070,7 +4070,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 4 + "port-version": 5 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 7ce7e6b28d45bb..d80c0dab196c9f 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2100eeaf2295829dbf9856e9e428c38cefc343be", + "version": "3.11.0", + "port-version": 5 + }, { "git-tree": "0036813fc0d0004d8a47ec3743ab9c9c37beaac2", "version": "3.11.0", From 1a597959c6848d97134cf587e3cf032c0150ade9 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 11 Apr 2024 10:40:20 +0000 Subject: [PATCH 19/28] add patch --- ports/lapack-reference/fix_prefix.patch | 17 +++++++++++++++++ ports/lapack-reference/portfile.cmake | 13 ++----------- 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 ports/lapack-reference/fix_prefix.patch diff --git a/ports/lapack-reference/fix_prefix.patch b/ports/lapack-reference/fix_prefix.patch new file mode 100644 index 00000000000000..9bfd8334e923a0 --- /dev/null +++ b/ports/lapack-reference/fix_prefix.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c99d71a..7333110 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,12 @@ set( + ${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION} + ) + ++if(WIN32) ++ set(CMAKE_STATIC_LIBRARY_PREFIX "lib") ++ set(CMAKE_SHARED_LIBRARY_PREFIX "lib") ++ set(CMAKE_IMPORT_LIBRARY_PREFIX "") ++endif() ++ + # Add the CMake directory for custom CMake modules + set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH}) + diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 633a8946e9ffbe..093f7f8c21be63 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_from_github( PATCHES cmake-config.patch lapacke.patch + fix_prefix.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) @@ -69,7 +70,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME lapack CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? +vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH lib/cmake/lapack-${VERSION}) #Should the target path be lapack and not lapack-reference? set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") @@ -129,16 +130,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/debug/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-release.cmake" [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/lapack/lapack-targets-debug.cmake" [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/liblapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]] [[_cmake_import_check_files_for_lapack "${_IMPORT_PREFIX}/lib/lapack${CMAKE_IMPORT_LIBRARY_SUFFIX}"]]) if(NOT USE_OPTIMIZED_BLAS) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") From 02ab40c2348e7cb560a23783587912a0d753d0aa Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 11 Apr 2024 10:41:01 +0000 Subject: [PATCH 20/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index d80c0dab196c9f..3f0bdd1dc5834a 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2100eeaf2295829dbf9856e9e428c38cefc343be", + "git-tree": "fa673138ec2415970db5bddd7ada4303131eb3a0", "version": "3.11.0", "port-version": 5 }, From 412cd13a16416188af14bd8ce0a4a0adf434d284 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 12 Apr 2024 08:24:58 +0000 Subject: [PATCH 21/28] modify LAPACK_LIBRARIES --- ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in index 1defc3aa8ada09..43ee87ea34cd58 100644 --- a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in @@ -25,7 +25,7 @@ if(@CBLAS@) find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(CBLAS) - set(LAPACK_LIBRARIES ${CBLAS_LIBRARIES} ${LAPACK_LIBRARIES}) + set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES}) endif() set(CMAKE_MODULE_PATH "${LAPACK_PREV_MODULE_PATH}") From 4d279b940df290e83965bc7bd8653fee626144e5 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 12 Apr 2024 08:25:54 +0000 Subject: [PATCH 22/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 3f0bdd1dc5834a..97660e4a6cd258 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa673138ec2415970db5bddd7ada4303131eb3a0", + "git-tree": "6cae79f07973cea96846dd593b73bae7567790a8", "version": "3.11.0", "port-version": 5 }, From a57ec217da5c91e393958884b369220a194d09f0 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 16 Apr 2024 06:37:03 +0000 Subject: [PATCH 23/28] modify patch --- ports/lapack-reference/fix_prefix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/lapack-reference/fix_prefix.patch b/ports/lapack-reference/fix_prefix.patch index 9bfd8334e923a0..d0fdcdeb276279 100644 --- a/ports/lapack-reference/fix_prefix.patch +++ b/ports/lapack-reference/fix_prefix.patch @@ -7,7 +7,7 @@ index c99d71a..7333110 100644 ) +if(WIN32) -+ set(CMAKE_STATIC_LIBRARY_PREFIX "lib") ++ set(CMAKE_STATIC_LIBRARY_PREFIX "") + set(CMAKE_SHARED_LIBRARY_PREFIX "lib") + set(CMAKE_IMPORT_LIBRARY_PREFIX "") +endif() From 905d4ba988b712f33bc3105b7aae3ca08cebec01 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 16 Apr 2024 06:37:24 +0000 Subject: [PATCH 24/28] update version --- versions/l-/lapack-reference.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 97660e4a6cd258..0d5d4ad3943d8c 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6cae79f07973cea96846dd593b73bae7567790a8", + "git-tree": "27fda0472d5bfb11fef0264ba62681f6d6b4b1d2", "version": "3.11.0", "port-version": 5 }, From 9092be4046dbf8bbd053e8f293939e30e837367a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 18 Apr 2024 01:56:18 +0000 Subject: [PATCH 25/28] add missing dependency --- ports/opencv4/0023-fix-no-flatbuffers.patch | 26 +++++++++++++++++++++ ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- ports/openmvs/fix_no_zstd.patch | 17 ++++++++++++++ ports/openmvs/portfile.cmake | 5 ++-- ports/openmvs/vcpkg.json | 2 +- 6 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 ports/opencv4/0023-fix-no-flatbuffers.patch create mode 100644 ports/openmvs/fix_no_zstd.patch diff --git a/ports/opencv4/0023-fix-no-flatbuffers.patch b/ports/opencv4/0023-fix-no-flatbuffers.patch new file mode 100644 index 00000000000000..82be2c950e9ed1 --- /dev/null +++ b/ports/opencv4/0023-fix-no-flatbuffers.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b6e382..29a81f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -756,7 +756,7 @@ include(cmake/OpenCVFindLibsVideo.cmake) + include(cmake/OpenCVFindLibsPerf.cmake) + include(cmake/OpenCVFindLAPACK.cmake) + include(cmake/OpenCVFindProtobuf.cmake) +-include(cmake/OpenCVDetectFlatbuffers.cmake) ++find_package(flatbuffers CONFIG REQUIRED) + if(WITH_TENGINE) + include(cmake/OpenCVFindTengine.cmake) + endif() +diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt +index 804b78e..86d9d45 100644 +--- a/modules/dnn/CMakeLists.txt ++++ b/modules/dnn/CMakeLists.txt +@@ -133,7 +133,7 @@ if(TARGET ocv.3rdparty.flatbuffers AND OPENCV_DNN_TFLITE) + if(NOT HAVE_FLATBUFFERS) + message(FATAL_ERROR "DNN: TFLite is not supported without enabled 'flatbuffers'. Check build configuration.") + endif() +- list(APPEND libs ocv.3rdparty.flatbuffers) ++ list(APPEND libs ocv.3rdparty.flatbuffers flatbuffers::flatbuffers) + list(APPEND fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tflite/schema_generated.h") + list(APPEND fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tflite") + diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index a85879d191f12d..59baabaa9b5e9c 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_from_github( 0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963 "${ARM64_WINDOWS_FIX}" 0022-fix-supportqnx.patch + 0023-fix-no-flatbuffers.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 8c6eb97fcaffa0..543f511919c1fe 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 15, + "port-version": 16, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/openmvs/fix_no_zstd.patch b/ports/openmvs/fix_no_zstd.patch new file mode 100644 index 00000000000000..155670ec9a5f67 --- /dev/null +++ b/ports/openmvs/fix_no_zstd.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39ec359..ee90ae6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,10 +177,8 @@ if(Boost_FOUND) + LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST) + ADD_DEFINITIONS(${Boost_DEFINITIONS}) + LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +- if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE) +- # work around this missing library link in vcpkg +- LIST(APPEND Boost_LIBRARIES zstd) +- endif() ++ # work around this missing library link in vcpkg ++ LIST(APPEND Boost_LIBRARIES zstd) + SET(_USE_BOOST TRUE) + endif() + diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index aacf1805362658..7c89413613cad2 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS - REF v2.1.0 + REF "v${VERSION}" SHA512 95d83c6694b63b6fd27657c4c5e22ddbc078d26b7324b8f17952a6c7e4547028698aa155077c0cfb916d3497ca31c365e0cbcd81f3cbe959ef40a7ee2e5cd300 HEAD_REF master PATCHES fix-build.patch no-absolute-paths.patch + fix_no_zstd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -82,4 +83,4 @@ configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/to configure_file("${SOURCE_PATH}/MvgOptimizeSfM.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgOptimizeSfM.py" @ONLY) file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 2ea8a37cb37acd..27b59511dcd0f5 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version": "2.1.0", - "port-version": 2, + "port-version": 3, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "license": "AGPL-3.0-only", From d9e6e39167afdfbcb8b335ece52c28165c82cf4f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 18 Apr 2024 01:56:52 +0000 Subject: [PATCH 26/28] update version --- versions/baseline.json | 4 ++-- versions/o-/opencv4.json | 5 +++++ versions/o-/openmvs.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5bb0f7cc288137..7e62abccda2394 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6430,7 +6430,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 15 + "port-version": 16 }, "opendnp3": { "baseline": "3.1.1", @@ -6494,7 +6494,7 @@ }, "openmvs": { "baseline": "2.1.0", - "port-version": 2 + "port-version": 3 }, "openni2": { "baseline": "2.2.0.33", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 5752ba2e07c6a9..3d307aa2b4b97f 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96e86183362119dc095c889b94a091b9348d9326", + "version": "4.8.0", + "port-version": 16 + }, { "git-tree": "ec4e040d476cee60b2fc21a1f847d30905ac9726", "version": "4.8.0", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 4649a87c686c9b..39d297eac4c8de 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb7822ad98280937ffd9f07fbb32ed9470854dcc", + "version": "2.1.0", + "port-version": 3 + }, { "git-tree": "8779bcf1acd942b029c79791b2335b252e151f20", "version": "2.1.0", From b8b4ea780013f1945ecbd7771d9e295278156bcd Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 18 Apr 2024 06:43:08 +0000 Subject: [PATCH 27/28] modify patch --- ports/opencv4/0023-fix-no-flatbuffers.patch | 2 +- ports/openmvs/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opencv4/0023-fix-no-flatbuffers.patch b/ports/opencv4/0023-fix-no-flatbuffers.patch index 82be2c950e9ed1..53ee3645dcc3e1 100644 --- a/ports/opencv4/0023-fix-no-flatbuffers.patch +++ b/ports/opencv4/0023-fix-no-flatbuffers.patch @@ -20,7 +20,7 @@ index 804b78e..86d9d45 100644 message(FATAL_ERROR "DNN: TFLite is not supported without enabled 'flatbuffers'. Check build configuration.") endif() - list(APPEND libs ocv.3rdparty.flatbuffers) -+ list(APPEND libs ocv.3rdparty.flatbuffers flatbuffers::flatbuffers) ++ list(APPEND libs flatbuffers::flatbuffers) list(APPEND fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tflite/schema_generated.h") list(APPEND fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tflite") diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 7c89413613cad2..0ed1eb59166bb4 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -83,4 +83,4 @@ configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/to configure_file("${SOURCE_PATH}/MvgOptimizeSfM.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgOptimizeSfM.py" @ONLY) file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From db1118a4b36b077bb145074129ad0277a3551b89 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 18 Apr 2024 06:43:48 +0000 Subject: [PATCH 28/28] update version --- versions/o-/opencv4.json | 2 +- versions/o-/openmvs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 3d307aa2b4b97f..1abdd7e5f9f105 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "96e86183362119dc095c889b94a091b9348d9326", + "git-tree": "1818e44260c19a5524d75c66fd51af9d5857df6d", "version": "4.8.0", "port-version": 16 }, diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 39d297eac4c8de..9c46beb9a7d599 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bb7822ad98280937ffd9f07fbb32ed9470854dcc", + "git-tree": "14cc4ac41f5710b5281e06697ac6e6cd7800377f", "version": "2.1.0", "port-version": 3 },