diff --git a/cmake/java.cmake b/cmake/java.cmake index 9b6b54189b..92bb319535 100644 --- a/cmake/java.cmake +++ b/cmake/java.cmake @@ -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) diff --git a/ortools/algorithms/java/CMakeLists.txt b/ortools/algorithms/java/CMakeLists.txt index 7f0626738f..368b8c7f10 100644 --- a/ortools/algorithms/java/CMakeLists.txt +++ b/ortools/algorithms/java/CMakeLists.txt @@ -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 diff --git a/ortools/constraint_solver/java/CMakeLists.txt b/ortools/constraint_solver/java/CMakeLists.txt index 09e9ba07a4..cabd5dfcf7 100644 --- a/ortools/constraint_solver/java/CMakeLists.txt +++ b/ortools/constraint_solver/java/CMakeLists.txt @@ -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 diff --git a/ortools/init/java/CMakeLists.txt b/ortools/init/java/CMakeLists.txt index e4eb952b2d..01e191c663 100644 --- a/ortools/init/java/CMakeLists.txt +++ b/ortools/init/java/CMakeLists.txt @@ -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 diff --git a/ortools/linear_solver/java/CMakeLists.txt b/ortools/linear_solver/java/CMakeLists.txt index e487b5a80a..e1aecc4a34 100644 --- a/ortools/linear_solver/java/CMakeLists.txt +++ b/ortools/linear_solver/java/CMakeLists.txt @@ -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