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/ampl-mp | |
| 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/ampl-mp')
| -rw-r--r-- | ports/ampl-mp/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/ampl-mp/vcpkg.json | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake index 89db3044e..730e687e6 100644 --- a/ports/ampl-mp/portfile.cmake +++ b/ports/ampl-mp/portfile.cmake @@ -16,12 +16,11 @@ vcpkg_from_github( install-targets.patch ) -if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL "arm" OR TRIPLET_SYSTEM_ARCH STREQUAL "arm64")) - set(EXPECTED_EXE ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT}/gen-expr-info.exe) - if (NOT EXISTS ${EXPECTED_EXE}) - message(FATAL_ERROR "Please install ${PORT}:x86-windows first.") +if (NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + set(ARITHCHK_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/gen-expr-info${VCPKG_HOST_EXECUTABLE_SUFFIX}) + if (NOT EXISTS "${ARITHCHK_EXEC}") + message(FATAL_ERROR "Expected ${ARITHCHK_EXEC} to exist.") endif() - set(ARITHCHK_EXEC ${EXPECTED_EXE}) endif() vcpkg_configure_cmake( diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json index cd6f91f55..8e97a5ce0 100644 --- a/ports/ampl-mp/vcpkg.json +++ b/ports/ampl-mp/vcpkg.json @@ -1,10 +1,15 @@ { "name": "ampl-mp", "version-string": "2020-11-11", + "port-version": 1, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", "dependencies": [ - "ampl-asl" + "ampl-asl", + { + "name": "ampl-mp", + "host": true + } ] } |