Commit 40387125 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

[Build System] Replace 5 by ${QT_MAJOR_VERSION} in more places

parent 285e1086
Pipeline #170442 passed with stage
in 5 minutes and 40 seconds
......@@ -72,7 +72,7 @@ if(NOT NODBUS)
find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS DBus)
endif()
add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_URL_CAST_FROM_STRING)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt${QT_MAJOR_VERSION}Widgets_EXECUTABLE_COMPILE_FLAGS}")
# MLT
find_package(MLT ${MLT_MIN_VERSION} REQUIRED)
......
......@@ -186,7 +186,7 @@ if(BUILD_COVERAGE)
target_link_libraries(kdenliveLib gcov)
endif()
set_property(TARGET kdenliveLib PROPERTY CXX_STANDARD 14)
add_definitions(${qt5gui_definitions} -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY)
add_definitions(${qt${QT_MAJOR_VERSION}gui_definitions} -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY)
# Optional deps
if(CRASH_AUTO_TEST)
......
# Create a static library from kiss_fft
find_package(Qt5Core REQUIRED)
find_package(Qt${QT_MAJOR_VERSION}Core REQUIRED)
include_directories(${CMAKE_BINARY_DIR})
add_library(kiss_fft STATIC _kiss_fft_guts.h kiss_fft.c tools/kiss_fftr.c)
set_property(TARGET kiss_fft PROPERTY C_STANDARD 99)
target_link_libraries(kiss_fft Qt5::Core)
target_link_libraries(kiss_fft Qt${QT_MAJOR_VERSION}::Core)
......@@ -9,8 +9,8 @@ add_library(mltpreview MODULE ${mltpreview_SRCS})
target_link_libraries(mltpreview
Qt5::Core
Qt5::Gui
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Gui
KF5::KIOCore
KF5::KIOWidgets
${MLT_LIBRARIES}
......
Supports Markdown
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