Commit b97be75f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent ac191942
Pipeline #120960 passed with stage
in 2 minutes and 8 seconds
......@@ -51,7 +51,7 @@ set(KDIAGRAM_LIB_VERSION "1.4.0")
find_package(KGantt ${KDIAGRAM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
......@@ -124,7 +124,7 @@ if(BUILD_TESTING)
endif()
add_subdirectory(src)
if (BUILD_TESTING)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test)
add_subdirectory(autotests)
add_subdirectory(tests)
......
......@@ -12,7 +12,7 @@ macro(IE_UNIT_TESTS)
add_test(NAME ${_testname} COMMAND ${_testname})
ecm_mark_as_test(${_testname})
target_link_libraries(${_testname}
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
KF5::AkonadiCore
${grant_lib}
KF5::CalendarUtils
......@@ -26,7 +26,7 @@ endmacro()
macro(IE_EXECUTABLE_TESTS)
foreach(_testname ${ARGN})
add_executable(${_testname} NOGUI TEST ${_testname}.cpp ${_testname}.h)
target_link_libraries(${_testname} KF5::CalendarCore Qt::Test KF5::IncidenceEditor Qt::Widgets)
target_link_libraries(${_testname} KF5::CalendarCore Qt${QT_MAJOR_VERSION}::Test KF5::IncidenceEditor Qt${QT_MAJOR_VERSION}::Widgets)
endforeach()
endmacro()
......@@ -42,7 +42,7 @@ ecm_mark_as_test(ktimezonecomboboxtest)
target_link_libraries(ktimezonecomboboxtest
KF5::CalendarCore
Qt::Test
Qt${QT_MAJOR_VERSION}::Test
KF5::IncidenceEditor
KF5::Completion
)
......@@ -53,8 +53,8 @@ add_test(NAME testindividualmaildialog COMMAND testindividualmaildialog)
ecm_mark_as_test(testindividualmaildialog)
target_link_libraries(testindividualmaildialog
KF5::CalendarCore
Qt::Test
Qt::Widgets
Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Widgets
KF5::WidgetsAddons
KF5::I18n
KF5::IncidenceEditor
......@@ -64,8 +64,8 @@ target_link_libraries(testindividualmaildialog
# set up an environment.
add_akonadi_isolated_test(
SOURCE incidencedatetimetest.cpp
LINK_LIBRARIES Qt::Test
Qt::Widgets
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Widgets
KF5::AkonadiWidgets
KF5::Completion
KF5::IncidenceEditor
......
......@@ -4,8 +4,8 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_executable(resourcemanagement_gui resourcemanagment_gui.cpp)
target_link_libraries(resourcemanagement_gui
Qt::Core
Qt::Gui
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Gui
KF5::Mime
KF5::IncidenceEditor
KF5::Libkdepim
......
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