cmake: remove ABSL_MUST_USE_RESULT for swig

should be fixed with absl upstream + swig 4.1 now support attibute
2023-02-03 10:25:10 +01:00
parent 13b5f78500
commit 9054f13f95
20 changed files with 20 additions and 41 deletions
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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)