Commit 6a875548 authored by Nicolas Carion's avatar Nicolas Carion

Merge branch 'Applications/19.04' into 'Applications/19.04'

Use rttr target as dynamic library when available

See merge request kde/kdenlive!29
parents de80a5c7 b48d76d8
......@@ -69,7 +69,7 @@ if(Qt5WebKitWidgets_FOUND)
endif()
## top_SRCS
file(GLOB top_SRCS "*.cpp")
# string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/lib/[^;]+;?" "" top_SRCS "${top_SRCS}")
# string(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/lib/[^;]+;?" "" top_SRCS "${top_SRCS}")
list(REMOVE_ITEM top_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
list(APPEND kdenlive_SRCS ${top_SRCS})
## Others special cases
......@@ -139,8 +139,12 @@ target_link_libraries(kdenliveLib
${MLTPP_LIBRARIES}
${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT}
kiss_fft
RTTR::Core_Lib)
kiss_fft)
if(TARGET RTTR:Core)
target_link_libraries(kdenliveLib RTTR::Core)
else()
target_link_libraries(kdenliveLib RTTR::Core_Lib)
endif()
if(BUILD_COVERAGE)
target_link_libraries(kdenliveLib gcov)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment