Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Calendar Support
Commits
dd0b76f8
Commit
dd0b76f8
authored
Jan 09, 2022
by
Laurent Montel
Browse files
Adapt build system for building against qt6
parent
ee8bc0ec
Pipeline
#121020
passed with stage
in 53 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
dd0b76f8
...
...
@@ -46,7 +46,7 @@ set(PIMCOMMON_LIB_VERSION "5.19.40")
set
(
AKONADI_VERSION
"5.19.40"
)
set
(
AKONADI_NOTES_VERSION
"5.19.40"
)
find_package
(
KF5Akonadi
${
AKONADI_VERSION
}
CONFIG REQUIRED
)
find_package
(
Qt
5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Widgets Test PrintSupport
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Widgets Test PrintSupport
)
find_package
(
KF5I18n
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
find_package
(
KF5GuiAddons
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
find_package
(
KF5KIO
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
...
...
@@ -99,7 +99,7 @@ install(EXPORT KF5CalendarSupportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/calendarsupport_version.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
COMPONENT Devel
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
COMPONENT Devel
)
...
...
src/CMakeLists.txt
View file @
dd0b76f8
...
...
@@ -93,7 +93,7 @@ endif()
generate_export_header
(
KF5CalendarSupport BASE_NAME calendarsupport
)
target_include_directories
(
KF5CalendarSupport INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/CalendarSupport/;
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/calendarsupport>"
)
target_include_directories
(
KF5CalendarSupport INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
}
/CalendarSupport/;
${
KDE_INSTALL_INCLUDEDIR_KF
}
/calendarsupport>"
)
target_include_directories
(
KF5CalendarSupport PUBLIC
"$<BUILD_INTERFACE:
${
calendarsupport_SOURCE_DIR
}
/src;
${
calendarsupport_BINARY_DIR
}
/src>"
)
target_link_libraries
(
...
...
@@ -102,7 +102,7 @@ PUBLIC
KF5::Mime
KF5::IdentityManagement
KF5::AkonadiCalendar
Qt::PrintSupport
Qt
${
QT_MAJOR_VERSION
}
::PrintSupport
PRIVATE
KF5::I18n
KF5::Completion
...
...
@@ -182,7 +182,7 @@ ecm_generate_headers(CalendarSupport_CamelCasefreebusy_HEADERS
ecm_generate_pri_file
(
BASE_NAME CalendarSupport
LIB_NAME KF5CalendarSupport
DEPS
"KMime KIdentityManagement AkonadiCalendar"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/CalendarSupport
DEPS
"KMime KIdentityManagement AkonadiCalendar"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
}
/CalendarSupport
)
install
(
FILES
...
...
@@ -190,7 +190,7 @@ install(FILES
${
CalendarSupport_CamelCaseprinter_HEADERS
}
${
CalendarSupport_CamelCasenext_HEADERS
}
${
CalendarSupport_CamelCasefreebusy_HEADERS
}
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/CalendarSupport
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/CalendarSupport
COMPONENT Devel
)
...
...
@@ -207,7 +207,7 @@ install(FILES
${
CalendarSupport_printer_HEADERS
}
${
CalendarSupport_next_HEADERS
}
${
CalendarSupport_freebusy_HEADERS
}
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/calendarsupport
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/calendarsupport
COMPONENT Devel
)
install
(
FILES
...
...
src/autotests/CMakeLists.txt
View file @
dd0b76f8
...
...
@@ -11,7 +11,7 @@ endif()
add_test
(
NAME noteeditdialogtest COMMAND noteeditdialogtest
)
ecm_mark_as_test
(
noteeditdialogtest
)
target_link_libraries
(
noteeditdialogtest
Qt::Test
Qt
${
QT_MAJOR_VERSION
}
::Test
KF5::AkonadiWidgets
KF5::AkonadiNotes
KF5::CalendarSupport
...
...
src/freebusymodel/autotests/CMakeLists.txt
View file @
dd0b76f8
...
...
@@ -4,7 +4,7 @@ macro(add_libkdepim_freebusymodel_unittest _name)
ecm_add_test
(
${
_name
}
.cpp
TEST_NAME
${
_name
}
NAME_PREFIX
"libkdepim-freebusymodel-"
LINK_LIBRARIES Qt::Test KF5::AkonadiCore KF5::CalendarUtils KF5::CalendarCore KF5::CalendarSupport
LINK_LIBRARIES Qt
${
QT_MAJOR_VERSION
}
::Test KF5::AkonadiCore KF5::CalendarUtils KF5::CalendarCore KF5::CalendarSupport
)
endmacro
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment