From 34de189f405bbaba22121fb098bcb8aaa2d73500 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Tue, 23 Apr 2024 17:42:43 +0200
Subject: [PATCH] backport cmake and bazel update from main

---
 bazel/swig_java.bzl | 6 ++++--
 cmake/dotnet.cmake  | 9 ++++++++-
 cmake/java.cmake    | 9 ++++++++-
 cmake/python.cmake  | 2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bazel/swig_java.bzl b/bazel/swig_java.bzl
index 877f597c7a..ec26d1f0f9 100644
--- a/bazel/swig_java.bzl
+++ b/bazel/swig_java.bzl
@@ -13,6 +13,9 @@
 
 """Build definitions for SWIG Java."""
 
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java/common:java_common.bzl", "java_common")
+
 def _create_src_jar(ctx, java_runtime_info, input_dir, output_jar):
     jar_args = ctx.actions.args()
     jar_args.add("cf", output_jar)
@@ -198,8 +201,7 @@ def ortools_java_wrap_cc(
         visibility = visibility,
         **kwargs
     )
-
-    native.java_library(
+    java_library(
         name = name,
         srcs = [srcjar],
         deps = java_deps,
diff --git a/cmake/dotnet.cmake b/cmake/dotnet.cmake
index 3b967abc1f..b2e1a628a3 100644
--- a/cmake/dotnet.cmake
+++ b/cmake/dotnet.cmake
@@ -278,7 +278,14 @@ endfunction()
 list(APPEND CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}")
 
 # Swig wrap all libraries
-foreach(SUBPROJECT IN ITEMS algorithms graph init linear_solver constraint_solver sat util)
+foreach(SUBPROJECT IN ITEMS
+ algorithms
+ graph
+ init
+ linear_solver
+ constraint_solver
+ sat
+ util)
   add_subdirectory(ortools/${SUBPROJECT}/csharp)
   target_link_libraries(google-ortools-native PRIVATE dotnet_${SUBPROJECT})
 endforeach()
diff --git a/cmake/java.cmake b/cmake/java.cmake
index dafc950ef4..c123541ba8 100644
--- a/cmake/java.cmake
+++ b/cmake/java.cmake
@@ -250,7 +250,14 @@ endfunction()
 list(APPEND CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}")
 
 # Swig wrap all libraries
-foreach(SUBPROJECT IN ITEMS algorithms graph init linear_solver constraint_solver sat util)
+foreach(SUBPROJECT IN ITEMS
+ algorithms
+ graph
+ init
+ linear_solver
+ constraint_solver
+ sat
+ util)
   add_subdirectory(ortools/${SUBPROJECT}/java)
   target_link_libraries(jni${JAVA_ARTIFACT} PRIVATE jni${SUBPROJECT})
 endforeach()
diff --git a/cmake/python.cmake b/cmake/python.cmake
index 2099134b44..fb3d7d9f7b 100644
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -282,9 +282,9 @@ foreach(SUBPROJECT IN ITEMS
  init
  algorithms
  graph
- constraint_solver
  linear_solver
  ${PDLP_DIR}
+ constraint_solver
  sat
  scheduling
  util)