New upstream version 24.0.5+dfsg1
This commit is contained in:
parent
52fa83f147
commit
4c2ea24267
61 changed files with 710 additions and 130 deletions
16
deps/obs-scripting/obspython/CMakeLists.txt
vendored
16
deps/obs-scripting/obspython/CMakeLists.txt
vendored
|
|
@ -42,7 +42,12 @@ if(CMAKE_VERSION VERSION_GREATER 3.7.2)
|
|||
else()
|
||||
SWIG_ADD_MODULE(obspython python obspython.i ../cstrcache.cpp ../cstrcache.h)
|
||||
endif()
|
||||
SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES})
|
||||
|
||||
IF(APPLE)
|
||||
SWIG_LINK_LIBRARIES(obspython obs-scripting libobs)
|
||||
ELSE()
|
||||
SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES})
|
||||
ENDIF()
|
||||
|
||||
function(install_plugin_bin_swig target additional_target)
|
||||
if(APPLE)
|
||||
|
|
@ -57,14 +62,7 @@ function(install_plugin_bin_swig target additional_target)
|
|||
PREFIX "")
|
||||
|
||||
if (APPLE)
|
||||
set_property(
|
||||
TARGET ${additional_target}
|
||||
APPEND
|
||||
PROPERTY INSTALL_RPATH
|
||||
"/usr/local/Cellar/python3/3.6.4_2/Frameworks/Python.framework/Versions/3.6/lib/"
|
||||
"/Library/Frameworks/Python.framework/Versions/3.6/lib/"
|
||||
"/opt/local/Library/Frameworks/Python.framework/Versions/3.6/lib/"
|
||||
)
|
||||
SET_TARGET_PROPERTIES(${additional_target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
|
||||
endif()
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/obspython.py"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue