diff --git a/ports/highs/fix-cuda.patch b/ports/highs/fix-cuda.patch deleted file mode 100644 index e5a6514ba9..0000000000 --- a/ports/highs/fix-cuda.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e390ac4b3..7117609d2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -154,7 +154,9 @@ else() - # $ - ) - -+ if (CUPDLP_GPU) - target_include_directories(highs PUBLIC "${CMAKE_CUDA_PATH}/include") -+ endif() - - # target_include_directories(highs PRIVATE - # $ diff --git a/ports/highs/fix-hconfig-path.patch b/ports/highs/fix-hconfig-path.patch deleted file mode 100644 index 8b3ef1a858..0000000000 --- a/ports/highs/fix-hconfig-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/HConfig.h.in b/src/HConfig.h.in -index 13470d465..734dcf382 100644 ---- a/src/HConfig.h.in -+++ b/src/HConfig.h.in -@@ -7,7 +7,7 @@ - #cmakedefine CUPDLP_GPU - #cmakedefine CUPDLP_FORCE_NATIVE - #cmakedefine CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@" --#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" -+#cmakedefine CMAKE_INSTALL_PREFIX "" - #cmakedefine HIGHSINT64 - #cmakedefine HIGHS_NO_DEFAULT_THREADS - #cmakedefine HIGHS_HAVE_MM_PAUSE -@@ -18,6 +18,6 @@ - #define HIGHS_VERSION_MAJOR @HIGHS_VERSION_MAJOR@ - #define HIGHS_VERSION_MINOR @HIGHS_VERSION_MINOR@ - #define HIGHS_VERSION_PATCH @HIGHS_VERSION_PATCH@ --#define HIGHS_DIR "@CMAKE_SOURCE_DIR@" -+#define HIGHS_DIR "" - - #endif /* HCONFIG_H_ */ diff --git a/ports/highs/fix-uwp.patch b/ports/highs/fix-uwp.patch deleted file mode 100644 index 22a8a3634d..0000000000 --- a/ports/highs/fix-uwp.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/app/CLI11.hpp b/app/CLI11.hpp -index 3268232dc..2ed2fd7c8 100644 ---- a/app/CLI11.hpp -+++ b/app/CLI11.hpp -@@ -434,6 +434,19 @@ CLI11_INLINE std::vector compute_win32_argv(); - namespace detail { - - #ifdef _WIN32 -+ #ifdef WINAPI_FAMILY -+ #if WINAPI_FAMILY == WINAPI_FAMILY_APP // window store app -+CLI11_INLINE std::vector compute_win32_argv() { -+ std::vector result; -+ -+ result.reserve(static_cast(__argc)); -+ for(size_t i = 0; i < static_cast(__argc); ++i) { -+ result.push_back(std::string(__argv[i])); -+ } -+ -+ return result; -+} -+ #else - CLI11_INLINE std::vector compute_win32_argv() { - std::vector result; - int argc = 0; -@@ -454,6 +467,8 @@ CLI11_INLINE std::vector compute_win32_argv() { - - return result; - } -+ #endif -+ #endif - #endif - - } // namespace detail diff --git a/ports/highs/portfile.cmake b/ports/highs/portfile.cmake index 1186a94a17..63ba331330 100644 --- a/ports/highs/portfile.cmake +++ b/ports/highs/portfile.cmake @@ -2,12 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ERGO-Code/HiGHS REF "v${VERSION}" - SHA512 b6155859fda446725406fb062c7e89ea90b254767c680f31e1581eca6cdb3e68f6cf74abefac9c095a54a6dde6d6b14bec5e2429c79506acff9d5b0586e53a57 + SHA512 a4c3827e76f264c7fd155ce945d35b421027bf668cdee16088b7217e616f0bef739bd9ecf61db7b77b52c8af56ab0429f9aff5baf4e0fa36dbc2d7682ef4b21f HEAD_REF master - PATCHES - fix-hconfig-path.patch - fix-uwp.patch - fix-cuda.patch ) vcpkg_cmake_configure( diff --git a/ports/highs/vcpkg.json b/ports/highs/vcpkg.json index a79645f349..c9f1850eb8 100644 --- a/ports/highs/vcpkg.json +++ b/ports/highs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "highs", - "version": "1.10.0", + "version": "1.11.0", "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.", "homepage": "https://highs.dev", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c8309e72eb..d42b97b3e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3657,7 +3657,7 @@ "port-version": 1 }, "highs": { - "baseline": "1.10.0", + "baseline": "1.11.0", "port-version": 0 }, "highway": { diff --git a/versions/h-/highs.json b/versions/h-/highs.json index 6f635ceaec..08909b8070 100644 --- a/versions/h-/highs.json +++ b/versions/h-/highs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "292b586e02578f48fb0ea37f8fd3fe7848ba34db", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "5b22266f9a4cff07b45b07828c852f01b0b50dde", "version": "1.10.0",