From 41d60ad520a533f661b558c7aada97b69b4954c7 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 3 Feb 2023 14:08:07 +0100 Subject: [PATCH] cmake: Fix SWIG build Still need to define ABSL_MUST_USE_RESULT= even with swig 4.1.1 --- ortools/algorithms/csharp/CMakeLists.txt | 2 +- ortools/algorithms/java/CMakeLists.txt | 2 +- ortools/algorithms/python/CMakeLists.txt | 2 +- ortools/constraint_solver/csharp/CMakeLists.txt | 2 +- ortools/constraint_solver/java/CMakeLists.txt | 2 +- ortools/constraint_solver/python/CMakeLists.txt | 2 +- ortools/graph/csharp/CMakeLists.txt | 2 +- ortools/graph/java/CMakeLists.txt | 2 +- ortools/init/csharp/CMakeLists.txt | 2 +- ortools/init/java/CMakeLists.txt | 2 +- ortools/init/python/CMakeLists.txt | 2 +- ortools/linear_solver/csharp/CMakeLists.txt | 2 +- ortools/linear_solver/java/CMakeLists.txt | 2 +- ortools/linear_solver/python/CMakeLists.txt | 2 +- ortools/sat/csharp/CMakeLists.txt | 2 +- ortools/sat/java/CMakeLists.txt | 2 +- ortools/scheduling/python/CMakeLists.txt | 2 +- ortools/util/csharp/CMakeLists.txt | 2 +- ortools/util/java/CMakeLists.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ortools/algorithms/csharp/CMakeLists.txt b/ortools/algorithms/csharp/CMakeLists.txt index 62747b229c..71cd7fb5c9 100644 --- a/ortools/algorithms/csharp/CMakeLists.txt +++ b/ortools/algorithms/csharp/CMakeLists.txt @@ -13,7 +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}) +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_OPTIONS -namespace ${DOTNET_PROJECT}.Algorithms -dllimport google-ortools-native) diff --git a/ortools/algorithms/java/CMakeLists.txt b/ortools/algorithms/java/CMakeLists.txt index c6031c09fe..0131dd05eb 100644 --- a/ortools/algorithms/java/CMakeLists.txt +++ b/ortools/algorithms/java/CMakeLists.txt @@ -13,7 +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}) +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_OPTIONS -package ${JAVA_PACKAGE}.algorithms) swig_add_library(jnialgorithms diff --git a/ortools/algorithms/python/CMakeLists.txt b/ortools/algorithms/python/CMakeLists.txt index 748384d53a..7230bf9221 100644 --- a/ortools/algorithms/python/CMakeLists.txt +++ b/ortools/algorithms/python/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE knapsack_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 2fba24b273..3301317b6c 100644 --- a/ortools/constraint_solver/csharp/CMakeLists.txt +++ b/ortools/constraint_solver/csharp/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 b56e05852f..19223e8381 100644 --- a/ortools/constraint_solver/java/CMakeLists.txt +++ b/ortools/constraint_solver/java/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${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/constraint_solver/python/CMakeLists.txt b/ortools/constraint_solver/python/CMakeLists.txt index 4bce1c876b..42aff8fa46 100644 --- a/ortools/constraint_solver/python/CMakeLists.txt +++ b/ortools/constraint_solver/python/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE routing.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 ad7f82c319..c405891135 100644 --- a/ortools/graph/csharp/CMakeLists.txt +++ b/ortools/graph/csharp/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 d8fd2077cd..73ea360230 100644 --- a/ortools/graph/java/CMakeLists.txt +++ b/ortools/graph/java/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE graph.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 b84f1ba87e..d248085ec6 100644 --- a/ortools/init/csharp/CMakeLists.txt +++ b/ortools/init/csharp/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 2c6af61935..44e29afb54 100644 --- a/ortools/init/java/CMakeLists.txt +++ b/ortools/init/java/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${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/init/python/CMakeLists.txt b/ortools/init/python/CMakeLists.txt index 7a259d8a78..bb12a80c83 100644 --- a/ortools/init/python/CMakeLists.txt +++ b/ortools/init/python/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE init.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 4556c849e5..c8aa796f05 100644 --- a/ortools/linear_solver/csharp/CMakeLists.txt +++ b/ortools/linear_solver/csharp/CMakeLists.txt @@ -13,7 +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}) +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_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 dbc34f7bce..4cfed5923e 100644 --- a/ortools/linear_solver/java/CMakeLists.txt +++ b/ortools/linear_solver/java/CMakeLists.txt @@ -13,7 +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}) +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_OPTIONS -package ${JAVA_PACKAGE}.linearsolver) swig_add_library(jnilinear_solver diff --git a/ortools/linear_solver/python/CMakeLists.txt b/ortools/linear_solver/python/CMakeLists.txt index 88d7761efe..e4aaf97cf4 100644 --- a/ortools/linear_solver/python/CMakeLists.txt +++ b/ortools/linear_solver/python/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE linear_solver.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) swig_add_library(pywraplp TYPE MODULE LANGUAGE python diff --git a/ortools/sat/csharp/CMakeLists.txt b/ortools/sat/csharp/CMakeLists.txt index 3436fc3404..a3ef70fb04 100644 --- a/ortools/sat/csharp/CMakeLists.txt +++ b/ortools/sat/csharp/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 4774e84109..467ded1089 100644 --- a/ortools/sat/java/CMakeLists.txt +++ b/ortools/sat/java/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE sat.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) 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 be3175506c..4a769f7a51 100644 --- a/ortools/scheduling/python/CMakeLists.txt +++ b/ortools/scheduling/python/CMakeLists.txt @@ -13,7 +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}) +set_property(SOURCE rcpsp.i PROPERTY COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS} ABSL_MUST_USE_RESULT=) swig_add_library(pywraprcpsp TYPE MODULE LANGUAGE python diff --git a/ortools/util/csharp/CMakeLists.txt b/ortools/util/csharp/CMakeLists.txt index bb995aa3bf..8fe573c5e7 100644 --- a/ortools/util/csharp/CMakeLists.txt +++ b/ortools/util/csharp/CMakeLists.txt @@ -13,7 +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}) +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_OPTIONS -namespace ${DOTNET_PROJECT}.Util -dllimport google-ortools-native) diff --git a/ortools/util/java/CMakeLists.txt b/ortools/util/java/CMakeLists.txt index 2eec83eeba..a3c8dd916f 100644 --- a/ortools/util/java/CMakeLists.txt +++ b/ortools/util/java/CMakeLists.txt @@ -13,7 +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}) +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_OPTIONS -package ${JAVA_PACKAGE}.util) swig_add_library(jniutil