always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swig: Fix java build when using swig 4.1.0

Browse Source
This commit is contained in:
Corentin Le Molgat
2022-11-07 15:29:40 +01:00
parent ecd2afe4bb
commit d1aed89a26
5 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/java.cmake
View File

@@ -222,25 +222,7 @@ endif()
#####################
## JAVA WRAPPERS ##
#####################
# CMake will remove all '-D' prefix (i.e. -DUSE_FOO become USE_FOO)
#get_target_property(FLAGS ${PROJECT_NAMESPACE}::ortools COMPILE_DEFINITIONS)
set(FLAGS -DUSE_BOP -DUSE_GLOP -DABSL_MUST_USE_RESULT)
if(USE_COINOR)
list(APPEND FLAGS "-DUSE_CBC" "-DUSE_CLP")
endif()
if(USE_GLPK)
list(APPEND FLAGS "-DUSE_GLPK")
endif()
if(USE_HIGHS)
list(APPEND FLAGS "-DUSE_HIGHS")
endif()
if(USE_PDLP)
list(APPEND FLAGS "-DUSE_PDLP")
endif()
if(USE_SCIP)
list(APPEND FLAGS "-DUSE_SCIP")
endif()
list(APPEND CMAKE_SWIG_FLAGS ${FLAGS} "-I${PROJECT_SOURCE_DIR}")
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)

2
ortools/algorithms/java/CMakeLists.txt
View File

@@ -14,7 +14,7 @@
set_property(SOURCE knapsack_solver.i PROPERTY CPLUSPLUS ON)
set_property(SOURCE knapsack_solver.i PROPERTY SWIG_MODULE_NAME main)
set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT)
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=)
set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_OPTIONS
-package ${JAVA_PACKAGE}.algorithms)
swig_add_library(jnialgorithms

2
ortools/constraint_solver/java/CMakeLists.txt
View File

@@ -14,7 +14,7 @@
set_property(SOURCE routing.i PROPERTY CPLUSPLUS ON)
set_property(SOURCE routing.i PROPERTY SWIG_MODULE_NAME main)
set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT)
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=)
set_property(SOURCE routing.i PROPERTY COMPILE_OPTIONS
-package ${JAVA_PACKAGE}.constraintsolver)
swig_add_library(jniconstraint_solver

2
ortools/init/java/CMakeLists.txt
View File

@@ -14,7 +14,7 @@
set_property(SOURCE init.i PROPERTY CPLUSPLUS ON)
set_property(SOURCE init.i PROPERTY SWIG_MODULE_NAME main)
set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT)
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=)
set_property(SOURCE init.i PROPERTY COMPILE_OPTIONS
-package ${JAVA_PACKAGE}.init)
swig_add_library(jniinit

2
ortools/linear_solver/java/CMakeLists.txt
View File

@@ -14,7 +14,7 @@
set_property(SOURCE linear_solver.i PROPERTY CPLUSPLUS ON)
set_property(SOURCE linear_solver.i PROPERTY SWIG_MODULE_NAME main)
set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT)
${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=)
set_property(SOURCE linear_solver.i PROPERTY COMPILE_OPTIONS
-package ${JAVA_PACKAGE}.linearsolver)
swig_add_library(jnilinear_solver