diff --git a/ortools/algorithms/csharp/CMakeLists.txt b/ortools/algorithms/csharp/CMakeLists.txt index 9e7388b6ef..62747b229c 100644 --- a/ortools/algorithms/csharp/CMakeLists.txt +++ b/ortools/algorithms/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE knapsack_solver.i PROPERTY CPLUSPLUS ON) set_property(SOURCE knapsack_solver.i PROPERTY SWIG_MODULE_NAME operations_research_algorithms) -set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.Algorithms -dllimport google-ortools-native) diff --git a/ortools/algorithms/java/CMakeLists.txt b/ortools/algorithms/java/CMakeLists.txt index 368b8c7f10..c6031c09fe 100644 --- a/ortools/algorithms/java/CMakeLists.txt +++ b/ortools/algorithms/java/CMakeLists.txt @@ -13,8 +13,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=) +set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.algorithms) swig_add_library(jnialgorithms diff --git a/ortools/algorithms/python/CMakeLists.txt b/ortools/algorithms/python/CMakeLists.txt index bd10034b43..748384d53a 100644 --- a/ortools/algorithms/python/CMakeLists.txt +++ b/ortools/algorithms/python/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE knapsack_solver.i PROPERTY CPLUSPLUS ON) set_property(SOURCE knapsack_solver.i PROPERTY SWIG_MODULE_NAME pywrapknapsack_solver) -set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) swig_add_library(pywrapknapsack_solver TYPE MODULE LANGUAGE python diff --git a/ortools/constraint_solver/csharp/CMakeLists.txt b/ortools/constraint_solver/csharp/CMakeLists.txt index b270bf1927..2fba24b273 100644 --- a/ortools/constraint_solver/csharp/CMakeLists.txt +++ b/ortools/constraint_solver/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE routing.i PROPERTY CPLUSPLUS ON) set_property(SOURCE routing.i PROPERTY SWIG_MODULE_NAME operations_research_constraint_solver) -set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE routing.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.ConstraintSolver -dllimport google-ortools-native) diff --git a/ortools/constraint_solver/java/CMakeLists.txt b/ortools/constraint_solver/java/CMakeLists.txt index cabd5dfcf7..b56e05852f 100644 --- a/ortools/constraint_solver/java/CMakeLists.txt +++ b/ortools/constraint_solver/java/CMakeLists.txt @@ -13,8 +13,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=) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE routing.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.constraintsolver) swig_add_library(jniconstraint_solver diff --git a/ortools/constraint_solver/python/CMakeLists.txt b/ortools/constraint_solver/python/CMakeLists.txt index 4606db3d41..4bce1c876b 100644 --- a/ortools/constraint_solver/python/CMakeLists.txt +++ b/ortools/constraint_solver/python/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE routing.i PROPERTY CPLUSPLUS ON) set_property(SOURCE routing.i PROPERTY SWIG_MODULE_NAME pywrapcp) -set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE routing.i PROPERTY COMPILE_OPTIONS -nofastunpack) swig_add_library(pywrapcp TYPE MODULE diff --git a/ortools/graph/csharp/CMakeLists.txt b/ortools/graph/csharp/CMakeLists.txt index 84a03ed31a..ad7f82c319 100644 --- a/ortools/graph/csharp/CMakeLists.txt +++ b/ortools/graph/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE graph.i PROPERTY CPLUSPLUS ON) set_property(SOURCE graph.i PROPERTY SWIG_MODULE_NAME operations_research_graph) -set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE graph.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.Graph -dllimport google-ortools-native) diff --git a/ortools/graph/java/CMakeLists.txt b/ortools/graph/java/CMakeLists.txt index 73a019f33b..d8fd2077cd 100644 --- a/ortools/graph/java/CMakeLists.txt +++ b/ortools/graph/java/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE graph.i PROPERTY CPLUSPLUS ON) set_property(SOURCE graph.i PROPERTY SWIG_MODULE_NAME main) -set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE graph.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.graph) swig_add_library(jnigraph diff --git a/ortools/init/csharp/CMakeLists.txt b/ortools/init/csharp/CMakeLists.txt index 2b71324eb6..b84f1ba87e 100644 --- a/ortools/init/csharp/CMakeLists.txt +++ b/ortools/init/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE init.i PROPERTY CPLUSPLUS ON) set_property(SOURCE init.i PROPERTY SWIG_MODULE_NAME operations_research_init) -set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE init.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.Init -dllimport google-ortools-native) diff --git a/ortools/init/java/CMakeLists.txt b/ortools/init/java/CMakeLists.txt index 01e191c663..2c6af61935 100644 --- a/ortools/init/java/CMakeLists.txt +++ b/ortools/init/java/CMakeLists.txt @@ -13,8 +13,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=) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE init.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.init) swig_add_library(jniinit diff --git a/ortools/init/python/CMakeLists.txt b/ortools/init/python/CMakeLists.txt index 4669ca0885..7a259d8a78 100644 --- a/ortools/init/python/CMakeLists.txt +++ b/ortools/init/python/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE init.i PROPERTY CPLUSPLUS ON) set_property(SOURCE init.i PROPERTY SWIG_MODULE_NAME pywrapinit) -set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) swig_add_library(pywrapinit TYPE MODULE LANGUAGE python diff --git a/ortools/linear_solver/csharp/CMakeLists.txt b/ortools/linear_solver/csharp/CMakeLists.txt index dd45f7fd63..4556c849e5 100644 --- a/ortools/linear_solver/csharp/CMakeLists.txt +++ b/ortools/linear_solver/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE linear_solver.i PROPERTY CPLUSPLUS ON) set_property(SOURCE linear_solver.i PROPERTY SWIG_MODULE_NAME operations_research_linear_solver) -set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE linear_solver.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.LinearSolver -dllimport google-ortools-native) diff --git a/ortools/linear_solver/java/CMakeLists.txt b/ortools/linear_solver/java/CMakeLists.txt index e1aecc4a34..dbc34f7bce 100644 --- a/ortools/linear_solver/java/CMakeLists.txt +++ b/ortools/linear_solver/java/CMakeLists.txt @@ -13,8 +13,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=) +set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE linear_solver.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.linearsolver) swig_add_library(jnilinear_solver @@ -31,8 +30,7 @@ target_link_libraries(jnilinear_solver PRIVATE ortools::ortools) set_property(SOURCE modelbuilder.i PROPERTY CPLUSPLUS ON) set_property(SOURCE modelbuilder.i PROPERTY SWIG_MODULE_NAME main) -set_property(SOURCE modelbuilder.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE modelbuilder.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE modelbuilder.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.modelbuilder) swig_add_library(jnimodelbuilder diff --git a/ortools/linear_solver/python/CMakeLists.txt b/ortools/linear_solver/python/CMakeLists.txt index ac25c9bddd..88d7761efe 100644 --- a/ortools/linear_solver/python/CMakeLists.txt +++ b/ortools/linear_solver/python/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE linear_solver.i PROPERTY CPLUSPLUS ON) set_property(SOURCE linear_solver.i PROPERTY SWIG_MODULE_NAME pywraplp) -set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) swig_add_library(pywraplp TYPE MODULE LANGUAGE python diff --git a/ortools/sat/csharp/CMakeLists.txt b/ortools/sat/csharp/CMakeLists.txt index 423fad1f56..3436fc3404 100644 --- a/ortools/sat/csharp/CMakeLists.txt +++ b/ortools/sat/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE sat.i PROPERTY CPLUSPLUS ON) set_property(SOURCE sat.i PROPERTY SWIG_MODULE_NAME operations_research_sat) -set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE sat.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.Sat -dllimport google-ortools-native) diff --git a/ortools/sat/java/CMakeLists.txt b/ortools/sat/java/CMakeLists.txt index b400f6c26c..4774e84109 100644 --- a/ortools/sat/java/CMakeLists.txt +++ b/ortools/sat/java/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE sat.i PROPERTY CPLUSPLUS ON) set_property(SOURCE sat.i PROPERTY SWIG_MODULE_NAME main) -set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE sat.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.sat) swig_add_library(jnisat diff --git a/ortools/scheduling/python/CMakeLists.txt b/ortools/scheduling/python/CMakeLists.txt index 5350807948..be3175506c 100644 --- a/ortools/scheduling/python/CMakeLists.txt +++ b/ortools/scheduling/python/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE rcpsp.i PROPERTY CPLUSPLUS ON) set_property(SOURCE rcpsp.i PROPERTY SWIG_MODULE_NAME pywraprcpsp) -set_property(SOURCE rcpsp.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) +set_property(SOURCE rcpsp.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) swig_add_library(pywraprcpsp TYPE MODULE LANGUAGE python diff --git a/ortools/util/csharp/CMakeLists.txt b/ortools/util/csharp/CMakeLists.txt index 3425807f34..bb995aa3bf 100644 --- a/ortools/util/csharp/CMakeLists.txt +++ b/ortools/util/csharp/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE sorted_interval_list.i PROPERTY CPLUSPLUS ON) set_property(SOURCE sorted_interval_list.i PROPERTY SWIG_MODULE_NAME operations_research_util) -set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_OPTIONS -namespace ${DOTNET_PROJECT}.Util -dllimport google-ortools-native) diff --git a/ortools/util/java/CMakeLists.txt b/ortools/util/java/CMakeLists.txt index 15a5e1f0ff..2eec83eeba 100644 --- a/ortools/util/java/CMakeLists.txt +++ b/ortools/util/java/CMakeLists.txt @@ -13,8 +13,7 @@ set_property(SOURCE sorted_interval_list.i PROPERTY CPLUSPLUS ON) set_property(SOURCE sorted_interval_list.i PROPERTY SWIG_MODULE_NAME main) -set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_DEFINITIONS - ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT) +set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS}) set_property(SOURCE sorted_interval_list.i PROPERTY COMPILE_OPTIONS -package ${JAVA_PACKAGE}.util) swig_add_library(jniutil diff --git a/ortools/util/python/CMakeLists.txt b/ortools/util/python/CMakeLists.txt index ca801e63db..ad621b32e5 100644 --- a/ortools/util/python/CMakeLists.txt +++ b/ortools/util/python/CMakeLists.txt @@ -11,7 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - pybind11_add_module(sorted_interval_list MODULE sorted_interval_list.cc) # note: macOS is APPLE and also UNIX ! if(APPLE)