mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 01:11:48 +08:00
a8e1b590c6
* 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>
25 lines
577 B
Diff
25 lines
577 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6c0642877..30fb625a2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -184,6 +184,7 @@ if(MSVC)
|
|
unsigned long y;
|
|
_BitScanReverse(&y, x);
|
|
_BitScanReverse64(&x, y);
|
|
+ __popcnt64(x);
|
|
return 0;
|
|
}"
|
|
HIGHS_HAVE_BITSCAN_REVERSE)
|
|
@@ -548,9 +549,9 @@ if (PYTHON)
|
|
endif()
|
|
|
|
# Add tests in examples/tests
|
|
-add_subdirectory(examples)
|
|
+#add_subdirectory(examples)
|
|
|
|
-add_subdirectory(app)
|
|
+#add_subdirectory(app)
|
|
|
|
if (EXP)
|
|
add_executable(doctest)
|