Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
Show All 16 Lines | |||||
17 | find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets) | 17 | find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets) | ||
18 | 18 | | |||
19 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS | 19 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS | ||
20 | Completion | 20 | Completion | ||
21 | Config | 21 | Config | ||
22 | ConfigWidgets | 22 | ConfigWidgets | ||
23 | CoreAddons | 23 | CoreAddons | ||
24 | Crash | 24 | Crash | ||
25 | DBusAddons | 25 | DBusAddons | ||
davidedmundson: We can probably get rid of at least this. Maybe quite a few others | |||||
26 | DocTools | 26 | DocTools | ||
27 | I18n | 27 | I18n | ||
28 | IconThemes | 28 | IconThemes | ||
29 | KCMUtils | 29 | KCMUtils | ||
30 | KIO | 30 | KIO | ||
31 | Service | 31 | Service | ||
32 | Solid | 32 | Solid | ||
33 | WidgetsAddons | 33 | WidgetsAddons | ||
Show All 40 Lines | 69 | set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" | |||
74 | if(X11_FOUND) | 74 | if(X11_FOUND) | ||
75 | set(HAVE_X11 TRUE) | 75 | set(HAVE_X11 TRUE) | ||
76 | endif() | 76 | endif() | ||
77 | else() | 77 | else() | ||
78 | set(X11_FOUND False) | 78 | set(X11_FOUND False) | ||
79 | endif() | 79 | endif() | ||
80 | 80 | | |||
81 | 81 | | |||
82 | configure_file(config-project-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-project-version.h) | | |||
83 | configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) | | |||
Removing this file is breaking the compilation: https://build.kde.org/view/Failing/job/Plasma/job/kinfocenter/job/kf5-qt5%20FreeBSDQt5.13/ 05:48:56 In file included from /usr/home/jenkins/workspace/Plasma/kinfocenter/kf5-qt5 FreeBSDQt5.13/Modules/base/os_current.cpp:24: 05:48:56 /usr/home/jenkins/workspace/Plasma/kinfocenter/kf5-qt5 FreeBSDQt5.13/Modules/pci/../base/os_base.h:35:10: fatal error: 'config-X11.h' file not found 05:48:56 #include <config-X11.h> 05:48:56 ^~~~~~~~~~~~~~ jjazeix: Removing this file is breaking the compilation: https://build.kde. | |||||
84 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | 82 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||
85 | 83 | | |||
86 | remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) | 84 | remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) | ||
87 | add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) | 85 | add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) | ||
88 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | 86 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | ||
89 | add_definitions(-DQT_USE_QSTRINGBUILDER) | 87 | add_definitions(-DQT_USE_QSTRINGBUILDER) | ||
90 | 88 | | |||
91 | 89 | | |||
92 | add_subdirectory( Categories ) | 90 | add_subdirectory( Categories ) | ||
93 | add_subdirectory( kcontrol/menus ) | 91 | add_subdirectory( kcontrol/menus ) | ||
94 | add_subdirectory( Modules ) | 92 | add_subdirectory( Modules ) | ||
95 | include(ECMOptionalAddSubdirectory) | 93 | include(ECMOptionalAddSubdirectory) | ||
96 | ecm_optional_add_subdirectory( doc ) | 94 | ecm_optional_add_subdirectory( doc ) | ||
97 | 95 | | |||
98 | include_directories( ToolTips ) | | |||
99 | | ||||
100 | set( kinfocenter_SRCS | | |||
101 | infocenter.cpp | | |||
102 | main.cpp | | |||
103 | sidepanel.cpp | | |||
104 | kcmcontainer.cpp | | |||
105 | kcmtreeitem.cpp | | |||
106 | kcmcategoryitem.cpp | | |||
107 | infokcmmodel.cpp | | |||
108 | infokcmproxymodel.cpp | | |||
109 | ToolTips/tooltipmanager.cpp | | |||
110 | ) | | |||
111 | | ||||
112 | add_executable( kinfocenter ${kinfocenter_SRCS} ) | | |||
113 | target_compile_definitions(kinfocenter PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}") | | |||
114 | | ||||
115 | target_link_libraries( kinfocenter | | |||
116 | KF5::Completion | | |||
117 | KF5::ConfigWidgets | | |||
118 | KF5::CoreAddons | | |||
119 | KF5::Crash | | |||
120 | KF5::DBusAddons | | |||
121 | KF5::I18n | | |||
122 | KF5::IconThemes | | |||
123 | KF5::KCMUtils | | |||
124 | KF5::Service | | |||
125 | KF5::Solid | | |||
126 | KF5::WidgetsAddons | | |||
127 | KF5::WindowSystem | | |||
128 | KF5::XmlGui | | |||
129 | ) | | |||
130 | 96 | | |||
131 | # add clang-format target for all our real source files | 97 | # add clang-format target for all our real source files | ||
132 | file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) | 98 | file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) | ||
133 | kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) | 99 | kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) | ||
134 | 100 | | |||
135 | ##install | 101 | ##install | ||
136 | 102 | | |||
137 | install( TARGETS kinfocenter ${INSTALL_TARGETS_DEFAULT_ARGS} ) | | |||
138 | install( FILES org.kde.kinfocenter.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) | 103 | install( FILES org.kde.kinfocenter.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) | ||
139 | install( PROGRAMS org.kde.kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) | 104 | install( PROGRAMS org.kde.kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) | ||
140 | install( FILES kinfocenterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kinfocenter ) | 105 | | ||
106 | ADD_CUSTOM_TARGET(kinfocenter_link ALL | ||||
davidedmundson: comments for future devs explaining the situation would be useful | |||||
107 | COMMAND ${CMAKE_COMMAND} -E create_symlink ${KDE_INSTALL_FULL_BINDIR}/systemsettings5 ${CMAKE_CURRENT_BINARY_DIR}/kinfocenter) | ||||
108 | | ||||
109 | install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kinfocenter DESTINATION ${KDE_INSTALL_FULL_BINDIR}/ ) | ||||
141 | 110 | | |||
142 | feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) | 111 | feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) |
We can probably get rid of at least this. Maybe quite a few others