generic: build fixes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-20 04:59:24 +03:00
parent ce37613433
commit a610fa5881
4 changed files with 26 additions and 14 deletions

View file

@ -133,7 +133,6 @@ KFirewallHelper::KFirewallHelper(const char* const helper, QObject *parent)
{ {
} }
int KFirewallHelper::apply(const QVariantMap &parameters) int KFirewallHelper::apply(const QVariantMap &parameters)
{ {
if (parameters.isEmpty()) { if (parameters.isEmpty()) {

View file

@ -3,8 +3,8 @@ project(khash)
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
include(FeatureSummary) include(FeatureSummary)
find_package(KDE4 4.23.0 REQUIRED) find_package(KDELibs4 4.23.0 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES}) include_directories(${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif() endif()
@ -16,8 +16,8 @@ set(khash_SRCS
add_executable(khash ${khash_SRCS}) add_executable(khash ${khash_SRCS})
target_link_libraries(khash target_link_libraries(khash
${KDE4_KDEUI_LIBS} KDE4::kdeui
${KDE4_KFILE_LIBS} KDE4::kfile
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}
) )

View file

@ -1,8 +1,8 @@
project(kman) project(kman)
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
find_package(KDE4 4.19.0 REQUIRED) find_package(KDELibs4 4.19.0 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES}) include_directories(${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif() endif()
@ -13,8 +13,21 @@ set(kman_sources
) )
add_executable(kman ${kman_sources}) add_executable(kman ${kman_sources})
target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KARCHIVE_LIBS}) target_link_libraries(kman
KDE4::kdeui
KDE4::kfile
KDE4::karchive
)
install(TARGETS kman DESTINATION ${KDE4_BIN_INSTALL_DIR}) install(
install(FILES kmanui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman) TARGETS kman
install(PROGRAMS kman.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) DESTINATION ${KDE4_BIN_INSTALL_DIR}
)
install(
FILES kmanui.rc
DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman
)
install(
PROGRAMS kman.desktop
DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
)

View file

@ -3,8 +3,8 @@ project(kprintjobs)
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
include(FeatureSummary) include(FeatureSummary)
find_package(KDE4 4.23.0 REQUIRED) find_package(KDELibs4 4.23.0 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES}) include_directories(${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif() endif()
@ -21,7 +21,7 @@ qt4_generate_dbus_interface(kded_kprintjobs.h org.kde.kprintjobs.xml)
kde4_add_plugin(kded_kprintjobs ${kded_kprintjobs_SRCS}) kde4_add_plugin(kded_kprintjobs ${kded_kprintjobs_SRCS})
target_link_libraries(kded_kprintjobs PRIVATE target_link_libraries(kded_kprintjobs PRIVATE
${KDE4_KDECORE_LIBS} KDE4::kdecore
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
cups cups
) )