Skip to content

Commit 8e082ac

Browse files
author
Christoph Ruecker
committed
[FIX] Deprecation of SWIG_ADD_MODULE in CMake 3.8
Change-Id: I6703408cca2f6de1e4e2ec004aab70d56ff6f6cf Signed-off-by: Christoph Ruecker <[email protected]>
1 parent e012618 commit 8e082ac

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

wrapper/csharp/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/csharp/src")
8383
# Swig wrapper build options
8484
###############################################################################
8585
SET_SOURCE_FILES_PROPERTIES(openconfigurator_core_wrapper_net.i PROPERTIES CPLUSPLUS ON)
86-
SWIG_ADD_MODULE(openconfigurator_core_wrapper_net csharp openconfigurator_core_wrapper_net.i)
87-
86+
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "3.7.0")
87+
SWIG_ADD_LIBRARY(openconfigurator_core_wrapper_net LANGUAGE csharp TYPE MODULE SOURCES openconfigurator_core_wrapper_net.i)
88+
ELSE()
89+
SWIG_ADD_MODULE(openconfigurator_core_wrapper_net csharp openconfigurator_core_wrapper_net.i)
90+
ENDIF()
8891
###############################################################################
8992
# Remove lib prefix under Linux
9093
###############################################################################

wrapper/java/CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,13 @@ SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/Java/src")
109109
# Add "-c++" option to SWIG command
110110
SET_SOURCE_FILES_PROPERTIES(${SWIG_INTERFACE_FILE} PROPERTIES CPLUSPLUS ON)
111111
SET_PROPERTY(SOURCE ${SWIG_INTERFACE_FILE} PROPERTY SWIG_FLAGS "-package" "org.epsg.openconfigurator.lib.wrapper")
112-
SWIG_ADD_MODULE(openconfigurator_core_wrapper_java java ${SWIG_INTERFACE_FILE})
112+
113+
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "3.7.0")
114+
SWIG_ADD_LIBRARY(openconfigurator_core_wrapper_java LANGUAGE java TYPE MODULE SOURCES ${SWIG_INTERFACE_FILE})
115+
ELSE()
116+
SWIG_ADD_MODULE(openconfigurator_core_wrapper_java java ${SWIG_INTERFACE_FILE})
117+
ENDIF()
118+
113119
#SET_TARGET_PROPERTIES(openconfigurator_core_wrapper_java PROPERTIES PREFIX "")
114120
# Create openPOWERLINK wrapper library
115121
SWIG_LINK_LIBRARIES(openconfigurator_core_wrapper_java openconfigurator_core_lib ${JAVA_LIBRARIES} ${Boost_LIBRARIES})

0 commit comments

Comments
 (0)