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

cmake: Fix SWIG build

Browse Source 
Still need to define ABSL_MUST_USE_RESULT= even with swig 4.1.1
This commit is contained in:
Corentin Le Molgat
2023-02-03 14:08:07 +01:00
parent 9054f13f95
commit 41d60ad520
19 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

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

@@ -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

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

@@ -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