diff --git a/ports/highs/fix-pkgconfig-zlib.patch b/ports/highs/fix-pkgconfig-zlib.patch new file mode 100644 index 00000000000000..c60a340161c2ed --- /dev/null +++ b/ports/highs/fix-pkgconfig-zlib.patch @@ -0,0 +1,11 @@ +diff --git a/highs.pc.in b/highs.pc.in +index 2ac74f4..fbd153d 100644 +--- a/highs.pc.in ++++ b/highs.pc.in +@@ -7,5 +7,5 @@ URL: https://github.com/ERGO-Code/HiGHS + Version: @HIGHS_VERSION_MAJOR@.@HIGHS_VERSION_MINOR@.@HIGHS_VERSION_PATCH@ + Libs: -L${libdir} -lhighs +-#TODO Libs.private (when HiGHS lib is build as static lib) + Cflags: -I${includedir} + Requires: ++Requires.private: zlib diff --git a/ports/highs/portfile.cmake b/ports/highs/portfile.cmake index fa7bfb247220bd..4d76fe4d14b65b 100644 --- a/ports/highs/portfile.cmake +++ b/ports/highs/portfile.cmake @@ -1,26 +1,35 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ERGO-Code/HiGHS - REF "v1.14.0" - SHA512 d4c2d09bf41384a58a04528ffaac223eee40dea4a1cadaea369791f6e8d1aa61ff3fce57e7c97cb5f4bef0f1305681066e8ef7483f4471770295f95b9ec337f7 - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DFAST_BUILD=ON - -DBUILD_TESTING=OFF - -DBUILD_EXAMPLES=OFF - -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON -) - -vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() -vcpkg_copy_tools(TOOL_NAMES highs AUTO_CLEAN) - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ERGO-Code/HiGHS + REF v${VERSION} + SHA512 0ea407784bc6c8e31c72fbcdcab201e8a7cc7debbca57504e74177658208151e90637e5fb1e0cdf1b1ae6b677e7865e77771ec025b17f8223f74d00fc6420546 + HEAD_REF master + PATCHES + fix-pkgconfig-zlib.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFAST_BUILD=ON + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES highs AUTO_CLEAN) + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/THIRD_PARTY_NOTICES.md" + "${SOURCE_PATH}/extern/cli11/CLI11.hpp" + "${SOURCE_PATH}/extern/pdqsort/license.txt" + "${SOURCE_PATH}/extern/zstr/LICENSE" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/highs/vcpkg.json b/ports/highs/vcpkg.json index 08a1f4851c1ae1..8b21ac0d8c3726 100644 --- a/ports/highs/vcpkg.json +++ b/ports/highs/vcpkg.json @@ -1,9 +1,9 @@ { "name": "highs", - "version": "1.14.0", + "version": "1.15.1", "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.", "homepage": "https://highs.dev", - "license": "MIT", + "license": "MIT AND BSD-3-Clause AND Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 68c39c8eb8d36d..4f1ad48ebdec6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3845,7 +3845,7 @@ "port-version": 0 }, "highs": { - "baseline": "1.14.0", + "baseline": "1.15.1", "port-version": 0 }, "highway": { diff --git a/versions/h-/highs.json b/versions/h-/highs.json index ef69f13639e5f4..ed8a82cef99789 100644 --- a/versions/h-/highs.json +++ b/versions/h-/highs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c70fd2590487bd56505ed8824ae764063330728", + "version": "1.15.1", + "port-version": 0 + }, { "git-tree": "ade8308af2c39213840e613146568b0e3ab5afe9", "version": "1.14.0",