From 34c8538ab952621c1ead25c4969355ac21adb7da Mon Sep 17 00:00:00 2001 From: Jason Francis Date: Fri, 16 Aug 2019 12:23:53 -0400 Subject: [PATCH] cmake: Fix SWIG deprecation warnings --- deps/obs-scripting/obslua/CMakeLists.txt | 13 ++++++++++++- deps/obs-scripting/obspython/CMakeLists.txt | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/deps/obs-scripting/obslua/CMakeLists.txt b/deps/obs-scripting/obslua/CMakeLists.txt index eb30a88c6..d35e1537f 100644 --- a/deps/obs-scripting/obslua/CMakeLists.txt +++ b/deps/obs-scripting/obslua/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(obslua) +if(POLICY CMP0078) + cmake_policy(SET CMP0078 OLD) +endif() + find_package(SWIG 2 REQUIRED) include(${SWIG_USE_FILE}) @@ -16,7 +20,14 @@ endif() include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -SWIG_ADD_MODULE(obslua lua obslua.i ../cstrcache.cpp ../cstrcache.h) +if(CMAKE_VERSION VERSION_GREATER 3.7.2) + SWIG_ADD_LIBRARY(obslua + LANGUAGE lua + TYPE MODULE + SOURCES obslua.i ../cstrcache.cpp ../cstrcache.h) +else() + SWIG_ADD_MODULE(obslua lua obslua.i ../cstrcache.cpp ../cstrcache.h) +endif() SWIG_LINK_LIBRARIES(obslua obs-scripting libobs ${LUA_LIBRARIES} ${EXTRA_LIBS}) function(install_plugin_bin_swig target additional_target) diff --git a/deps/obs-scripting/obspython/CMakeLists.txt b/deps/obs-scripting/obspython/CMakeLists.txt index f5475e994..57b65bdbc 100644 --- a/deps/obs-scripting/obspython/CMakeLists.txt +++ b/deps/obs-scripting/obspython/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(obspython) +if(POLICY CMP0078) + cmake_policy(SET CMP0078 OLD) +endif() + find_package(SWIG 2 REQUIRED) include(${SWIG_USE_FILE}) @@ -30,7 +34,14 @@ if(WIN32) string(REGEX REPLACE "_d" "" PYTHON_LIBRARIES "${PYTHON_LIBRARIES}") endif() -SWIG_ADD_MODULE(obspython python obspython.i ../cstrcache.cpp ../cstrcache.h) +if(CMAKE_VERSION VERSION_GREATER 3.7.2) + SWIG_ADD_LIBRARY(obspython + LANGUAGE python + TYPE MODULE + SOURCES obspython.i ../cstrcache.cpp ../cstrcache.h) +else() + SWIG_ADD_MODULE(obspython python obspython.i ../cstrcache.cpp ../cstrcache.h) +endif() SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES}) function(install_plugin_bin_swig target additional_target)