mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 09:09:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
54b42ecea7
vcpkg/ports/highs/fix-threads.patch

14 lines
545 B
Diff
Raw Normal View History

[HiGHS] Added new port for the HiGHS optimization library (#30529) * Added new port for the HiGHS optimization library * Fixed formatting and added versions * Fixed sha hash * Updated port to exclude arm64 support * Update SHA * Added license to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Use VERSION variable for portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update SHA * Removed redundant differences in cmake patch * Update SHA * Improved pkconfig and thread support * Update SHA * Enable support for arm64 * Update SHA * Fixed linker errors for arm64-windows builds * Update SHA * Changed patch name, converted tab to spaces for consistency * Update SHA * Cleaned portfile, replaced pkgconfig patch with vcpkg command * Updated SHA * Updated fix-threads patch * Update SHA * Improved the threads patch * Update SHA --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Luke Marshall <luke.marshall@microsoft.com>
2023-04-03 12:15:12 +08:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
[highs] update to 1.6.0 (#34198)
2023-10-03 07:10:33 +08:00
index fc24e57..fe0edfe 100644
[HiGHS] Added new port for the HiGHS optimization library (#30529) * Added new port for the HiGHS optimization library * Fixed formatting and added versions * Fixed sha hash * Updated port to exclude arm64 support * Update SHA * Added license to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Use VERSION variable for portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update SHA * Removed redundant differences in cmake patch * Update SHA * Improved pkconfig and thread support * Update SHA * Enable support for arm64 * Update SHA * Fixed linker errors for arm64-windows builds * Update SHA * Changed patch name, converted tab to spaces for consistency * Update SHA * Cleaned portfile, replaced pkgconfig patch with vcpkg command * Updated SHA * Updated fix-threads patch * Update SHA * Improved the threads patch * Update SHA --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Luke Marshall <luke.marshall@microsoft.com>
2023-04-03 12:15:12 +08:00
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
[highs] update to 1.6.0 (#34198)
2023-10-03 07:10:33 +08:00
@@ -573,7 +573,7 @@ else()
$<BUILD_INTERFACE:${HIGHS_SOURCE_DIR}/extern/zstr>
[HiGHS] Added new port for the HiGHS optimization library (#30529) * Added new port for the HiGHS optimization library * Fixed formatting and added versions * Fixed sha hash * Updated port to exclude arm64 support * Update SHA * Added license to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Use VERSION variable for portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update SHA * Removed redundant differences in cmake patch * Update SHA * Improved pkconfig and thread support * Update SHA * Enable support for arm64 * Update SHA * Fixed linker errors for arm64-windows builds * Update SHA * Changed patch name, converted tab to spaces for consistency * Update SHA * Cleaned portfile, replaced pkgconfig patch with vcpkg command * Updated SHA * Updated fix-threads patch * Update SHA * Improved the threads patch * Update SHA --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Luke Marshall <luke.marshall@microsoft.com>
2023-04-03 12:15:12 +08:00
)
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)")
[highs] update to 1.6.0 (#34198)
2023-10-03 07:10:33 +08:00
endif()
[HiGHS] Added new port for the HiGHS optimization library (#30529) * Added new port for the HiGHS optimization library * Fixed formatting and added versions * Fixed sha hash * Updated port to exclude arm64 support * Update SHA * Added license to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Use VERSION variable for portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update SHA * Removed redundant differences in cmake patch * Update SHA * Improved pkconfig and thread support * Update SHA * Enable support for arm64 * Update SHA * Fixed linker errors for arm64-windows builds * Update SHA * Changed patch name, converted tab to spaces for consistency * Update SHA * Cleaned portfile, replaced pkgconfig patch with vcpkg command * Updated SHA * Updated fix-threads patch * Update SHA * Improved the threads patch * Update SHA --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Luke Marshall <luke.marshall@microsoft.com>
2023-04-03 12:15:12 +08:00
[highs] update to 1.6.0 (#34198)
2023-10-03 07:10:33 +08:00
# # on UNIX system the 'lib' prefix is automatically added
Reference in New Issue Copy Permalink