port: cleanup

ortools/port/BUILD.bazel

@@ -13,15 +13,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
-    name = "utf8",
-    hdrs = ["utf8.h"],
-    deps = [
-        "//ortools/base",
-        "//ortools/base:encodingutils",
-    ],
-)
-
 cc_library(
     name = "sysinfo",
     srcs = ["sysinfo.cc"],
@@ -32,6 +23,28 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "proto_utils",
+    hdrs = [
+        "proto_utils.h",
+    ],
+    deps = [
+        "//ortools/base",
+        "//ortools/util:parse_proto",
+        "@com_google_absl//absl/strings",
+        "@com_google_protobuf//:protobuf",
+    ],
+)
+
+cc_library(
+    name = "utf8",
+    hdrs = ["utf8.h"],
+    deps = [
+        "//ortools/base",
+        "//ortools/base:encodingutils",
+    ],
+)
+
 cc_library(
     name = "file",
     srcs = [
@@ -48,16 +61,3 @@ cc_library(
         "@com_google_absl//absl/time",
     ],
 )
-
-cc_library(
-    name = "proto_utils",
-    hdrs = [
-        "proto_utils.h",
-    ],
-    deps = [
-        "//ortools/base",
-        "//ortools/util:parse_proto",
-        "@com_google_absl//absl/strings",
-        "@com_google_protobuf//:protobuf",
-    ],
-)

ortools/port/CMakeLists.txt

@@ -12,6 +12,8 @@
 # limitations under the License.
 
 file(GLOB _SRCS "*.h" "*.cc")
+list(FILTER _SRCS EXCLUDE REGEX "/[^/]*_test\\.cc$")
+
 set(NAME ${PROJECT_NAME}_port)
 
 # Will be merge in libortools.so