alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: use swig_add_modules if cmake > 3.7

Browse Source 
swig_add_module has been deprecated

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>
This commit is contained in:
Brendan Le Foll 2017-09-18 13:52:55 +02:00 committed by Abhishek Malik
parent 2f9132c429
commit bd6e4ec786
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/CMakeLists.txt
View File

@ -252,7 +252,11 @@ macro(_upm_swig_python)
# Swig module name (example: pyupm_a110x-python2) # Swig module name (example: pyupm_a110x-python2)
set (python_wrapper_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR}) set (python_wrapper_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR})
swig_add_module (${python_wrapper_name} python pyupm_${libname}.i) if (CMAKE_VERSION VERSION_LESS "3.8")
swig_add_module (${python_wrapper_name} python pyupm_${libname}.i)
else ()
swig_add_library (${python_wrapper_name} LANGUAGE python SOURCES pyupm_${libname}.i)
endif ()
# Get target library name (example _pyupm_a110x-python2) # Get target library name (example _pyupm_a110x-python2)
set (python_wrapper_target ${SWIG_MODULE_${python_wrapper_name}_REAL_NAME}) set (python_wrapper_target ${SWIG_MODULE_${python_wrapper_name}_REAL_NAME})
add_dependencies(${python_wrapper_target} ${libname}) add_dependencies(${python_wrapper_target} ${libname})
@ -360,7 +364,11 @@ macro(upm_swig_node)
set_property (SOURCE jsupm_${libname}.i PROPERTY SWIG_FLAGS "-node" "-DV8_VERSION=${V8_VERSION_HEX}") set_property (SOURCE jsupm_${libname}.i PROPERTY SWIG_FLAGS "-node" "-DV8_VERSION=${V8_VERSION_HEX}")
set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON)
swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i) if (CMAKE_VERSION VERSION_LESS "3.8")
swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i)
else ()
swig_add_library (jsupm_${libname} LANGUAGE javascript SOURCES jsupm_${libname}.i)
endif ()
add_dependencies(jsupm_${libname} ${libname}) add_dependencies(jsupm_${libname} ${libname})
swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname}) swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname})
target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME} target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME}
@ -430,7 +438,11 @@ macro(upm_swig_java)
# the source must be added when building the JAVA wrapper. # the source must be added when building the JAVA wrapper.
# See issue #518 # See issue #518
# TODO: Fix this somehow # TODO: Fix this somehow
swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src}) if (CMAKE_VERSION VERSION_LESS "3.8")
swig_add_module (javaupm_${libname} java javaupm_${libname}.i ${module_src})
else ()
swig_add_library (javaupm_${libname} LANGUAGE java SOURCES javaupm_${libname}.i ${module_src})
endif ()
# If the C++ target depends on C++ interfaces, make the JAVA target # If the C++ target depends on C++ interfaces, make the JAVA target
# depend on the JAVA interfaces # depend on the JAVA interfaces