mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 01:59:00 +08:00
[highs] upgrade to version 1.7.2 (#40058)
This commit is contained in:
parent
08f38c8a85
commit
9c92649d25
@ -1,20 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 605a1e2..148c006 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -196,6 +196,7 @@ if(MSVC)
|
||||
unsigned long y;
|
||||
_BitScanReverse(&y, x);
|
||||
_BitScanReverse64(&x, y);
|
||||
+ __popcnt64(x);
|
||||
return 0;
|
||||
}"
|
||||
HIGHS_HAVE_BITSCAN_REVERSE)
|
||||
@@ -570,7 +572,6 @@ else(FAST_BUILD)
|
||||
# Add tests in examples/tests
|
||||
add_subdirectory(examples)
|
||||
|
||||
- add_subdirectory(app)
|
||||
|
||||
if(EXP)
|
||||
add_executable(doctest)
|
@ -1,20 +1,28 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 605a1e275..47233aa10 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,6 +5,7 @@
|
||||
cmake_minimum_required(VERSION 3.15)
|
||||
|
||||
# set preference for clang compiler and intel compiler over gcc and other compilers
|
||||
+if(0)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
|
||||
set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
|
||||
@@ -12,6 +13,7 @@ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
|
||||
set(CMAKE_CXX_COMPILER_NAMES clang++ icpc c++ ${CMAKE_CXX_COMPILER_NAMES})
|
||||
+endif()
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aa5930287..42fa1fde7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,6 +7,7 @@
|
||||
cmake_minimum_required(VERSION 3.15...3.27)
|
||||
|
||||
# set preference for clang compiler and intel compiler over gcc and other compilers
|
||||
+if(0)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
|
||||
set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
|
||||
@@ -14,6 +15,7 @@ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
|
||||
include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
|
||||
set(CMAKE_CXX_COMPILER_NAMES clang++ icpc c++ ${CMAKE_CXX_COMPILER_NAMES})
|
||||
+endif()
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
@@ -246,6 +248,7 @@ if(MSVC)
|
||||
unsigned long y;
|
||||
_BitScanReverse(&y, x);
|
||||
_BitScanReverse64(&x, y);
|
||||
+ __popcnt64(x);
|
||||
return 0;
|
||||
}"
|
||||
HIGHS_HAVE_BITSCAN_REVERSE)
|
||||
|
@ -1,17 +1,17 @@
|
||||
diff --git a/src/HConfig.h.in b/src/HConfig.h.in
|
||||
index 652f6651f..62b81f83c 100644
|
||||
index 198e07b0d..0d9eba53f 100644
|
||||
--- a/src/HConfig.h.in
|
||||
+++ b/src/HConfig.h.in
|
||||
@@ -4,7 +4,7 @@
|
||||
#cmakedefine FAST_BUILD
|
||||
@@ -5,7 +5,7 @@
|
||||
#cmakedefine ZLIB_FOUND
|
||||
#cmakedefine CUPDLP_CPU
|
||||
#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
|
||||
#cmakedefine HIGHS_HAVE_BUILTIN_CLZ
|
||||
@@ -15,6 +15,6 @@
|
||||
@@ -16,6 +16,6 @@
|
||||
#define HIGHS_VERSION_MAJOR @HIGHS_VERSION_MAJOR@
|
||||
#define HIGHS_VERSION_MINOR @HIGHS_VERSION_MINOR@
|
||||
#define HIGHS_VERSION_PATCH @HIGHS_VERSION_PATCH@
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index fc24e57..fe0edfe 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -573,7 +573,7 @@ else()
|
||||
$<BUILD_INTERFACE:${HIGHS_SOURCE_DIR}/extern/zstr>
|
||||
)
|
||||
target_link_libraries(highs ZLIB::ZLIB)
|
||||
- set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)")
|
||||
+ set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)\nfind_dependency(Threads)")
|
||||
endif()
|
||||
|
||||
# # on UNIX system the 'lib' prefix is automatically added
|
@ -2,12 +2,10 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ERGO-Code/HiGHS
|
||||
REF "v${VERSION}"
|
||||
SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130
|
||||
SHA512 9c8172fa22952859e1064d1823d327b51f83ff180b58153cd0a06ca6f756e0aa1538622de2bb5cee7caf5884e9a3cc9d492dd830a422f4cac63f884a4720c997
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-hconfig-path.patch
|
||||
fix-cmake-output.patch
|
||||
fix-threads.patch
|
||||
fix-compiler.patch
|
||||
)
|
||||
|
||||
@ -22,7 +20,8 @@ vcpkg_cmake_configure(
|
||||
|
||||
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")
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "highs",
|
||||
"version": "1.6.0",
|
||||
"port-version": 1,
|
||||
"version": "1.7.2",
|
||||
"description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.",
|
||||
"homepage": "https://highs.dev",
|
||||
"license": "MIT",
|
||||
|
@ -3441,8 +3441,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"highs": {
|
||||
"baseline": "1.6.0",
|
||||
"port-version": 1
|
||||
"baseline": "1.7.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"highway": {
|
||||
"baseline": "1.2.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "177abe2290aaf86774d62802557936f3a0fea958",
|
||||
"version": "1.7.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "70dcabf84d768dffa37123812c300637dc9231a5",
|
||||
"version": "1.6.0",
|
||||
|
Loading…
Reference in New Issue
Block a user