Merge branch 'fix-swig-flags' into opencv_build_config

OpenShot · Jan 13, 2021 · 0cb9286 · 0cb9286
2 parents f21cf35 + b445d6d
commit 0cb9286
Show file tree

Hide file tree

Showing 17 changed files with 4,220 additions and 81 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -58,6 +58,12 @@ 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)
+set(defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+set_property(SOURCE openshot.i PROPERTY
+  SWIG_FLAGS $<$<BOOL:${defs}>:-D$<JOIN:${defs}, -D>>)
+
 ### 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 \

diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt
@@ -74,6 +74,12 @@ 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)
+set(defs $<TARGET_PROPERTY:openshot,COMPILE_DEFINITIONS>)
+set_property(SOURCE openshot.i PROPERTY
+  SWIG_FLAGS $<$<BOOL:${defs}>:-D$<JOIN:${defs}, -D>>)
+
 ### 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 \
@@ -83,9 +89,9 @@ 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
+  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 ()
 

diff --git a/codecov.yml b/codecov.yml
@@ -1,10 +1,8 @@
-codecov:
-  branch: default
 coverage:
   status:
     project:
       default:
-        base: pr # Only post a status to pull requests
+        only_pulls: true # Only post a status to pull requests
         informational: true # Don't block PRs based on coverage stats (yet?)
 ignore:
   - "examples"