Merge branch 'develop' into frac-python-types

OpenShot · Jan 27, 2021 · dbaac4d · dbaac4d
2 parents c84d77d + b5c3d0b
commit dbaac4d
Show file tree

Hide file tree

Showing 81 changed files with 4,363 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ https://github.com/OpenShot/libopenshot/issues
 
 ### License
 
-Copyright (c) 2008-2020 OpenShot Studios, LLC.
+Copyright (c) 2008-2021 OpenShot Studios, LLC.
 
 OpenShot Library (libopenshot) is free software: you can redistribute it
 and/or modify it under the terms of the GNU Lesser General Public License

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -58,20 +58,42 @@ endif()
 set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
 set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
 
+# Set the SWIG_FLAGS from the library target, IFF its
+# COMPILE_DEFINITIONS property is set (in practice, always true)
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_defs
+    $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+endif()
+if(DEFINED _defs)
+  set_property(SOURCE openshot.i PROPERTY
+    COMPILE_DEFINITIONS ${_defs})
+else()
+  get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS)
+  foreach(_d ${_defs})
+    list(APPEND _flags -D${_d})
+  endforeach()
+  set_property(SOURCE openshot.i PROPERTY
+    SWIG_FLAGS ${_flags})
+endif()
+
 ### Suppress a ton of warnings in the generated SWIG C++ code
 set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
   -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
   -Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
 separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
 set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
 
-### Take include dirs from target, automatically if possible
-if (CMAKE_VERSION VERSION_GREATER 3.13)
-  set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
-elseif (CMAKE_VERSION VERSION_GREATER 3.12)
-  set_property(SOURCE openshot.i PROPERTY
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
-endif ()
+### Take include dirs from target
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_inc $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_inc $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
+endif()
+if (DEFINED _inc)
+  set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc})
+endif()
 
 ### Add the SWIG interface file (which defines all the SWIG methods)
 if (CMAKE_VERSION VERSION_LESS 3.8.0)

diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt
@@ -74,20 +74,42 @@ endif()
 set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
 set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
 
+# Set the SWIG_FLAGS from the library target, IFF its
+# COMPILE_DEFINITIONS property is set (in practice, always true)
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_defs
+    $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+endif()
+if(DEFINED _defs)
+  set_property(SOURCE openshot.i PROPERTY
+    COMPILE_DEFINITIONS ${_defs})
+else()
+  get_property(_defs TARGET openshot PROPERTY COMPILE_DEFINITIONS)
+  foreach(_d ${_defs})
+    list(APPEND _flags -D${_d})
+  endforeach()
+  set_property(SOURCE openshot.i PROPERTY
+    SWIG_FLAGS ${_flags})
+endif()
+
 ### Suppress a ton of warnings in the generated SWIG C++ code
 set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
   -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
   -Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
 separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
 set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
 
-### Take include dirs from target, automatically if possible
-if (CMAKE_VERSION VERSION_GREATER 3.13)
-	set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
-else ()
-	set_property(SOURCE openshot.i PROPERTY
-    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
-endif ()
+### Take include dirs from target
+if(CMAKE_VERSION VERSION_GREATER 3.15)
+  set(_inc $<REMOVE_DUPLICATES:$<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>>)
+elseif(CMAKE_VERSION VERSION_GREATER 3.12)
+  set(_inc $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
+endif()
+if (DEFINED _inc)
+  set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES ${_inc})
+endif()
 
 ### Add the SWIG interface file (which defines all the SWIG methods)
 if (CMAKE_VERSION VERSION_LESS 3.8.0)

diff --git a/cmake/Modules/FindResvg.cmake b/cmake/Modules/FindResvg.cmake
@@ -50,6 +50,7 @@ endif()
 find_path(Resvg_INCLUDE_DIRS
   ResvgQt.h
   PATHS
+    ${Resvg_ROOT}
     ${RESVGDIR}
     ${RESVGDIR}/include
     $ENV{RESVGDIR}
@@ -65,6 +66,7 @@ find_path(Resvg_INCLUDE_DIRS
 find_library(Resvg_LIBRARIES
   NAMES resvg
   PATHS
+    ${Resvg_ROOT}
     ${RESVGDIR}
     ${RESVGDIR}/lib
     $ENV{RESVGDIR}