diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-03-26 12:55:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:55:34 -0700 |
| commit | b5bb1511f0a07be530e0bde3ae098eb3d8e83e68 (patch) | |
| tree | 62f7ed43202e512d28ac92fb2be768283f62dee9 /ports/clapack | |
| parent | 6a63ecae92e3eb26ae596e5c4ddf527f045803a4 (diff) | |
| download | vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.tar.gz vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.zip | |
[many ports] Apply host dependencies (#16479)
* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json
* [many ports] Apply host dependencies
* [yasm-tool] Revert yasm-tool changes to split into PR #16478
* [many ports] Add versions
* [vcpkg.cmake] Revert change applied in other PR
* [boost-modular-build-helper] Merge from master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/clapack')
| -rw-r--r-- | ports/clapack/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/clapack/support-uwp.patch | 6 | ||||
| -rw-r--r-- | ports/clapack/vcpkg.json | 8 |
3 files changed, 14 insertions, 10 deletions
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 356387488..b60a22cb8 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -20,11 +20,11 @@ vcpkg_extract_source_archive_ex( support-uwp.patch ) -if (VCPKG_TARGET_IS_UWP) - if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/arithchk.exe) - message(FATAL_ERROR "Please install ${PORT}:x86-windows first.") - endif() - set(ARITHCHK_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/arithchk.exe) +if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + set(ARITHCHK_PATH ${CURRENT_HOST_INSTALLED_DIR}/tools/clapack/arithchk${VCPKG_HOST_EXECUTABLE_SUFFIX}) + if(NOT EXISTS "${ARITHCHK_PATH}") + message(FATAL_ERROR "Expected ${ARITHCHK_PATH} to exist.") + endif() endif() vcpkg_configure_cmake( diff --git a/ports/clapack/support-uwp.patch b/ports/clapack/support-uwp.patch index 3cbb750be..eeb6bc3d5 100644 --- a/ports/clapack/support-uwp.patch +++ b/ports/clapack/support-uwp.patch @@ -41,9 +41,9 @@ index 094614a..e5b40ab 100644 ARCHIVE DESTINATION lib INCLUDES DESTINATION include) -+install(TARGETS arithchk -+ RUNTIME DESTINATION tools -+) ++if (NOT ARITHCHK_PATH) ++ install(TARGETS arithchk RUNTIME DESTINATION tools/clapack) ++endif() \ No newline at end of file diff --git a/F2CLIBS/libf2c/inquire.c b/F2CLIBS/libf2c/inquire.c index 5936a67..4846d41 100644 diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 7d7c90a41..8450cd3db 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,10 +1,14 @@ { "name": "clapack", "version-string": "3.2.1", - "port-version": 16, + "port-version": 17, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ - "blas" + "blas", + { + "name": "clapack", + "host": true + } ] } |