Skip to content

Commit 2bb4ba5

Browse files
committed
cmake: sat/java cleanup
1 parent 1f37966 commit 2bb4ba5

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

ortools/sat/java/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313

14-
set_property(SOURCE sat.swig PROPERTY CPLUSPLUS ON)
15-
set_property(SOURCE sat.swig PROPERTY SWIG_MODULE_NAME main)
16-
set_property(SOURCE sat.swig PROPERTY COMPILE_DEFINITIONS
17-
${OR_TOOLS_COMPILE_DEFINITIONS})
18-
set_property(SOURCE sat.swig PROPERTY COMPILE_OPTIONS
19-
-package ${JAVA_PACKAGE}.sat)
20-
2114
# SWIG generator
2215
add_executable(gen_cp_model_proto_swig gen_cp_model_proto_swig.cc)
2316
target_link_libraries(gen_cp_model_proto_swig PRIVATE
@@ -81,6 +74,13 @@ set_target_properties(jni_cp_model_proto PROPERTIES
8174
target_link_libraries(jni_cp_model_proto PRIVATE ortools::ortools)
8275

8376
# sat
77+
set_property(SOURCE sat.swig PROPERTY CPLUSPLUS ON)
78+
set_property(SOURCE sat.swig PROPERTY SWIG_MODULE_NAME main)
79+
set_property(SOURCE sat.swig PROPERTY COMPILE_DEFINITIONS
80+
${OR_TOOLS_COMPILE_DEFINITIONS})
81+
set_property(SOURCE sat.swig PROPERTY COMPILE_OPTIONS
82+
-package ${JAVA_PACKAGE}.sat)
83+
8484
set(SWIG_MODULE_jnisat_EXTRA_DEPS java_cp_model_proto)
8585
swig_add_library(jnisat
8686
TYPE OBJECT

0 commit comments

Comments
 (0)