Merge pull request ERGO-Code#2492 from ERGO-Code/pr-2461

PR 2461 updated with latest

Author: galabovaa

BUILD.bazel

@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_binary", "cc_test")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 
 copy_file(
     name = "highs-config",
@@ -16,9 +16,8 @@ cc_library(
 
 cc_library(
     name = "highs",
-    srcs = glob([
+    srcs = ["highs/interfaces/highs_c_api.cpp"] + glob([
         "extern/filereaderlp/*.cpp",
-        "highs/interfaces/highs_c_api.cpp",
         "highs/io/*.cpp",
         "highs/ipm/*.cpp",
         "highs/ipm/ipx/*.cc",
@@ -35,18 +34,21 @@ cc_library(
         "highs/test_kkt/*.cpp",
         "highs/util/*.cpp",
     ]),
-    hdrs = glob([
-        "**/*.h",
+    hdrs = [
         "highs/mip/feasibilityjump.hh",
+    ] + glob([
+        "**/*.h",
         "highs/qpsolver/*.hpp",
-        "highs/Highs.h",
         "extern/filereaderlp/*.hpp",
         "extern/zstr/*.hpp",
     ]),
-    copts = [
-        "-Wno-unused-variable",
-        "-Wno-unused-but-set-variable",
-    ],
+    copts = select({
+        "@rules_cc//cc/compiler:msvc-cl": [],
+        "//conditions:default": [
+            "-Wno-unused-variable",
+            "-Wno-unused-but-set-variable",
+        ],
+    }),
     includes = [
         "extern",
         # "extern/filereaderlp",
@@ -66,7 +68,10 @@ cc_library(
         # "highs/util",
         "bazel-bin",
     ],
-    linkopts = ["-lpthread"],
+    linkopts = select({
+        "@rules_cc//cc/compiler:msvc-cl": ["-DEFAULTLIB:shell32.lib"],
+        "//conditions:default": ["-lpthread"],
+    }),
     visibility = ["//visibility:public"],
     deps = [
         "//:config",
@@ -76,8 +81,10 @@ cc_library(
 
 cc_library(
     name = "highs-runtime-opts",
-    hdrs = ["app/HighsRuntimeOptions.h",
-            "app/CLI11.hpp"],
+    hdrs = [
+        "app/CLI11.hpp",
+        "app/HighsRuntimeOptions.h",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "//:highs",
@@ -180,11 +187,13 @@ TEST_NAMES = [
 [cc_test(
     name = name,
     srcs = ["check/%s.cpp" % name],
-    copts = [
-        "-Iextern",
-        "-Wno-unused-variable",
-        "-Wno-unused-but-set-variable",
-    ],
+    copts = ["-Iextern"] + select({
+        "@rules_cc//cc/compiler:msvc-cl": [],
+        "//conditions:default": [
+            "-Wno-unused-variable",
+            "-Wno-unused-but-set-variable",
+        ],
+    }),
     deps = [
         ":highs",
         ":test_lib",

MODULE.bazel

@@ -7,15 +7,15 @@ module(
 
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.7.1",
+    version = "1.8.1",
 )
 
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.16",
+    version = "0.1.2",
 )
 
 bazel_dep(
     name = "zlib",
-    version = "1.3.1.bcr.3",
+    version = "1.3.1.bcr.5",
 )

highs/HConfig.h.bazel.in

@@ -8,8 +8,15 @@
 #define HiGHSRELEASE
 /* #undef HIGHSINT64 */
 /* #undef HIGHS_HAVE_MM_PAUSE */
+#ifdef __has_builtin
+#if __has_builtin(__builtin_clz) && __has_builtin(__builtin_clzll)
 #define HIGHS_HAVE_BUILTIN_CLZ
-/* #undef HIGHS_HAVE_BITSCAN_REVERSE */
+#endif
+#endif
+
+#ifdef _MSC_VER
+#define HIGHS_HAVE_BITSCAN_REVERSE
+#endif
 
 #define HIGHS_GITHASH "bdf95f2e0"
 #define HIGHS_VERSION_MAJOR 1