backport cmake and bazel update from main
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -282,9 +282,9 @@ foreach(SUBPROJECT IN ITEMS
|
||||
init
|
||||
algorithms
|
||||
graph
|
||||
constraint_solver
|
||||
linear_solver
|
||||
${PDLP_DIR}
|
||||
constraint_solver
|
||||
sat
|
||||
scheduling
|
||||
util)
|
||||
|
||||
Reference in New Issue
Block a user