Changeset View
Changeset View
Standalone View
Standalone View
src/CMakeLists.txt
Show All 10 Lines | 3 | set ( | |||
---|---|---|---|---|---|
11 | activitiessync_p.cpp | 11 | activitiessync_p.cpp | ||
12 | cleaning.cpp | 12 | cleaning.cpp | ||
13 | 13 | | |||
14 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/database/Database.cpp | 14 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/database/Database.cpp | ||
15 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/database/schema/ResourcesDatabaseSchema.cpp | 15 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/database/schema/ResourcesDatabaseSchema.cpp | ||
16 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/utils/qsqlquery_iterator.cpp | 16 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/utils/qsqlquery_iterator.cpp | ||
17 | ) | 17 | ) | ||
18 | 18 | | |||
19 | ecm_qt_declare_logging_category(KActivitiesStats_LIB_SRCS | ||||
kossebau: As we want to reuse the source files also with the tests, better store in a separate var here… | |||||
Do you have a suggestion how to share the variable between the two CMake files ? meven: Do you have a suggestion how to share the variable between the two CMake files ?
I tried moving… | |||||
20 | HEADER kactivities-stat-logsettings.h | ||||
21 | IDENTIFIER KACTIVITY_STAT_LOG | ||||
ivan: KACTIVITIE -> KACTIVITIE**S ** | |||||
22 | CATEGORY_NAME kf5.kactivity.stat) | ||||
23 | | ||||
24 | | ||||
19 | qt5_add_dbus_interface ( | 25 | qt5_add_dbus_interface ( | ||
20 | KActivitiesStats_LIB_SRCS | 26 | KActivitiesStats_LIB_SRCS | ||
21 | 27 | | |||
22 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml | 28 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml | ||
23 | resourcesscoring_interface | 29 | resourcesscoring_interface | ||
24 | ) | 30 | ) | ||
25 | 31 | | |||
26 | qt5_add_dbus_interface ( | 32 | qt5_add_dbus_interface ( | ||
27 | KActivitiesStats_LIB_SRCS | 33 | KActivitiesStats_LIB_SRCS | ||
28 | 34 | | |||
29 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml | 35 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml | ||
30 | resourceslinking_interface | 36 | resourceslinking_interface | ||
31 | ) | 37 | ) | ||
32 | 38 | | |||
33 | 39 | | |||
34 | | ||||
35 | add_library ( | 40 | add_library ( | ||
36 | KF5ActivitiesStats SHARED | 41 | KF5ActivitiesStats SHARED | ||
37 | ${KActivitiesStats_LIB_SRCS} | 42 | ${KActivitiesStats_LIB_SRCS} | ||
38 | ) | 43 | ) | ||
39 | add_library(KF5::ActivitiesStats ALIAS KF5ActivitiesStats) | 44 | add_library(KF5::ActivitiesStats ALIAS KF5ActivitiesStats) | ||
40 | 45 | | |||
41 | include_directories ( | 46 | include_directories ( | ||
42 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src | 47 | ${KASTATS_CURRENT_ROOT_SOURCE_DIR}/src | ||
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s) | 145 | ecm_generate_pri_file ( | |||
143 | DEPS "KActivities" | 148 | DEPS "KActivities" | ||
144 | FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KActivitiesStats | 149 | FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KActivitiesStats | ||
145 | ) | 150 | ) | ||
146 | install ( | 151 | install ( | ||
147 | FILES ${PRI_FILENAME} | 152 | FILES ${PRI_FILENAME} | ||
148 | DESTINATION ${ECM_MKSPECS_INSTALL_DIR} | 153 | DESTINATION ${ECM_MKSPECS_INSTALL_DIR} | ||
149 | ) | 154 | ) | ||
150 | 155 | | |||
151 | |
As we want to reuse the source files also with the tests, better store in a separate var here, e.g. named KActivitiesStats_LOG_SRCS.
And add this manually to KActivitiesStats_LIB_SRCS and for the test as commented above: