1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
|
Author: Nico Schlömer <nico.schloemer@gmail.com>
Description: Fix SWIG and CMake configure warnings
Last-Updated: 2019-05-31
Forwarded: https://gitlab.kitware.com/xdmf/xdmf/merge_requests/55
Index: xdmf-3.0+git20190531/CMakeLists.txt
===================================================================
--- xdmf-3.0+git20190531.orig/CMakeLists.txt
+++ xdmf-3.0+git20190531/CMakeLists.txt
@@ -1,4 +1,6 @@
cmake_minimum_required(VERSION 2.8.5)
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0078 NEW)
project(Xdmf)
@@ -129,7 +131,7 @@ if(XDMF_WRAP_PYTHON)
endif ()
set_source_files_properties(${python_name}.i PROPERTIES CPLUSPLUS ON)
set(swig_extra_generated_files "")
- swig_add_module(${python_name}Python python ${python_name}.i)
+ swig_add_library(${python_name}Python LANGUAGE python SOURCES ${python_name}.i)
if (NOT APPLE)
swig_link_libraries(${python_name}Python ${python_name} ${PYTHON_LIBRARIES})
@@ -202,7 +204,7 @@ if(XDMF_WRAP_JAVA)
set(CMAKE_SWIG_FLAGS ${XDMF_SWIG_FLAGS} -v -make_default -package mil.army.arl.xdmf)
set_source_files_properties(${java_name}.i PROPERTIES CPLUSPLUS ON)
set(swig_extra_generated_files "")
- swig_add_module(${java_name}Java java ${java_name}.i)
+ swig_add_library(${java_name}Java LANGUAGE java SOURCES ${java_name}.i)
swig_link_libraries(${java_name}Java ${java_name})
if(WIN32)
|