Skip to content

Commit e7a92a5

Browse files
committed
Bindings: Pick up include dirs from targets
1 parent 178c8e2 commit e7a92a5

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/bindings/python/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
5555
separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
5656
set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
5757

58+
### Take include dirs from target, automatically if possible
59+
if (CMAKE_VERSION VERSION_GREATER 3.13)
60+
set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
61+
else ()
62+
set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
63+
endif ()
64+
5865
### Add the SWIG interface file (which defines all the SWIG methods)
5966
if (CMAKE_VERSION VERSION_LESS 3.8.0)
6067
swig_add_module(pyopenshot python openshot.i)
@@ -68,7 +75,7 @@ if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
6875

6976
### Link the new python wrapper library with libopenshot
7077
target_link_libraries(${SWIG_MODULE_pyopenshot_REAL_NAME}
71-
${PYTHON_LIBRARIES} openshot)
78+
PUBLIC ${PYTHON_LIBRARIES} openshot)
7279

7380
### Check if the following Debian-friendly python module path exists
7481
SET(PYTHON_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")

src/bindings/ruby/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ IF (RUBY_FOUND)
5656
separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
5757
set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
5858

59+
### Take include dirs from target, automatically if possible
60+
if (CMAKE_VERSION VERSION_GREATER 3.13)
61+
set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
62+
else ()
63+
set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES $<TARGET_PROPERTY:openshot,INCLUDE_DIRECTORIES>)
64+
endif ()
65+
5966
### Add the SWIG interface file (which defines all the SWIG methods)
6067
if (CMAKE_VERSION VERSION_LESS 3.8.0)
6168
swig_add_module(rbopenshot ruby openshot.i)

0 commit comments

Comments
 (0)