Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KAlarm
Commits
c4ba1ae8
Commit
c4ba1ae8
authored
Jan 10, 2022
by
Laurent Montel
😁
Browse files
Adapt build system for building against qt6
parent
2d1be2ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
c4ba1ae8
...
...
@@ -82,7 +82,7 @@ install(EXPORT KF5AlarmCalendarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/kalarmcal_version.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
COMPONENT Devel
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
COMPONENT Devel
)
ecm_qt_install_logging_categories
(
...
...
autotests/CMakeLists.txt
View file @
c4ba1ae8
...
...
@@ -2,8 +2,8 @@
# SPDX-FileCopyrightText: none
include
(
ECMMarkAsTest
)
find_package
(
Qt
5
DBus CONFIG REQUIRED
)
find_package
(
Qt
5
Test CONFIG REQUIRED
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
DBus CONFIG REQUIRED
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
Test CONFIG REQUIRED
)
macro
(
macro_unit_tests
)
foreach
(
_testname
${
ARGN
}
)
...
...
@@ -12,8 +12,8 @@ macro(macro_unit_tests)
ecm_mark_as_test
(
${
_testname
}
)
target_link_libraries
(
${
_testname
}
KF5AlarmCalendar
Qt::DBus
Qt::Test
)
Qt
${
QT_MAJOR_VERSION
}
::DBus
Qt
${
QT_MAJOR_VERSION
}
::Test
)
endforeach
()
endmacro
()
if
(
NOT WIN32
)
...
...
src/CMakeLists.txt
View file @
c4ba1ae8
...
...
@@ -66,7 +66,7 @@ set_target_properties(KF5AlarmCalendar PROPERTIES
)
target_include_directories
(
KF5AlarmCalendar INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/KAlarmCal>"
)
target_include_directories
(
KF5AlarmCalendar INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
}
/KAlarmCal>"
)
target_include_directories
(
KF5AlarmCalendar PUBLIC
"$<BUILD_INTERFACE:
${
KAlarmCal_SOURCE_DIR
}
/src;
${
KAlarmCal_BINARY_DIR
}
/src>"
)
...
...
@@ -96,17 +96,17 @@ ecm_generate_headers(KAlarmCal_CamelCase_HEADERS
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/kalarmcal_export.h
${
KAlarmCal_HEADERS
}
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/KAlarmCal/kalarmcal
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/KAlarmCal/kalarmcal
COMPONENT Devel
)
install
(
FILES
${
KAlarmCal_CamelCase_HEADERS
}
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/KAlarmCal/KAlarmCal/
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/KAlarmCal/KAlarmCal/
COMPONENT Devel
)
ecm_generate_pri_file
(
BASE_NAME KAlarmCal LIB_NAME KF5AlarmCalendar DEPS
"KHolidays KIdentityManagement KCoreAddons KCalendarCore AkonadiCore"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
/KAlarmCal/
)
ecm_generate_pri_file
(
BASE_NAME KAlarmCal LIB_NAME KF5AlarmCalendar DEPS
"KHolidays KIdentityManagement KCoreAddons KCalendarCore AkonadiCore"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
}
/KAlarmCal/
)
if
(
BUILD_QCH
)
ecm_add_qch
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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