From 63b00960a9abc502695c3ba76feb7b4a01100daa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 9 Nov 2015 09:45:53 +0200 Subject: [PATCH] generic: build system cleanups Signed-off-by: Ivailo Monev --- CMakeLists.txt | 2 +- kglobalaccel/CMakeLists.txt | 19 +-- kmenuedit/CMakeLists.txt | 29 +++-- localization/currency/CMakeLists.txt | 230 ++++++++++++++++++++++++++++++++--- 4 files changed, 243 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b984356..98eb03ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") include(CheckIncludeFiles) include(CheckFunctionExists) -find_package(KDE4 4.14.3 REQUIRED) +find_package(KDE4 4.18.0 REQUIRED) include(KDE4Defaults) option(WITH_XINERAMA "Xinerama support for multi-headed X displays" ON) diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt index df4a7a53..0fc97077 100644 --- a/kglobalaccel/CMakeLists.txt +++ b/kglobalaccel/CMakeLists.txt @@ -3,11 +3,12 @@ project(kglobalaccel) ############################################################################### ### KDED Global Accel Daemon -include_directories( ${KDE4_KDEUI_INCLUDES} ) +include_directories(${KDE4_KDEUI_INCLUDES}) -if (X11_Xkb_FOUND) +if(X11_Xkb_FOUND) SET(HAVE_XKB TRUE) endif() + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-kglobalaccel.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h @@ -19,13 +20,15 @@ set(kglobalaccel_SRCS component.cpp globalshortcut.cpp globalshortcutsregistry.cpp - globalshortcutcontext.cpp) + globalshortcutcontext.cpp +) + +if(Q_WS_X11) + set(kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_x11.cpp) +endif() -if ( Q_WS_X11 ) - set( kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_x11.cpp ) -endif ( Q_WS_X11 ) +add_executable( kglobalaccel ${kglobalaccel_SRCS}) -add_executable( kglobalaccel ${kglobalaccel_SRCS} ) target_link_libraries(kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) # Install application and configuration @@ -33,5 +36,5 @@ install( TARGETS kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} ) # install( FILES kglobalaccel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) install( FILES kglobalaccel.desktop DESTINATION ${SERVICES_INSTALL_DIR}) # KNotify configuration -install( FILES kglobalaccel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel ) +install( FILES kglobalaccel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt index 96681036..c6ceb3e5 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -1,10 +1,24 @@ -add_subdirectory( pixmaps ) +add_subdirectory(pixmaps) + +set(kmenueditcommon_STAT_SRCS + preferencesdlg.cpp + klinespellchecking.cpp + basictab.cpp + treeview.cpp + kmenuedit.cpp + menufile.cpp + menuinfo.cpp + khotkeys.cpp +) -set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab.cpp treeview.cpp kmenuedit.cpp menufile.cpp menuinfo.cpp ) -set(kmenueditcommon_STAT_SRCS ${kmenueditcommon_STAT_SRCS} khotkeys.cpp) ########### next target ############### -qt4_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit) +qt4_add_dbus_adaptor( + kmenueditcommon_STAT_SRCS + org.kde.kmenuedit.xml + kmenuedit.h + KMenuEdit +) qt4_add_dbus_interface( kmenueditcommon_STAT_SRCS @@ -21,10 +35,9 @@ install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( PROGRAMS kmenuedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit ) +install(PROGRAMS kmenuedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit) add_dependencies(kmenuedit kded_khotkeys) -kde4_install_icons( ${ICON_INSTALL_DIR} ) - +kde4_install_icons(${ICON_INSTALL_DIR}) diff --git a/localization/currency/CMakeLists.txt b/localization/currency/CMakeLists.txt index 796f32b0..9fb01026 100644 --- a/localization/currency/CMakeLists.txt +++ b/localization/currency/CMakeLists.txt @@ -1,20 +1,210 @@ -set(listCurrency - adf - adp - aed - afa - afn - all - amd - ang - aoa - aon - ars - ats - aud - awg - azm azn bam bbd bdt bef bgl bgn bhd bif bmd bnd bob bov brl bsd btn bwp byr bzd cad cdf chf clf clp cny cop cou crc cuc cup cve cyp czk dem djf dkk dop dzd eek egp ern esp etb eur fim fjd fkp frf gbp gel ghc ghs gip gmd gnf grd gtq gwp gyd hkd hnl hrk htg huf idr iep ils inr iqd irr isk itl jmd jod jpy kes kgs khr kmf kpw krw kwd kyd kzt lak lbp lkr lrd lsl ltl luf lvl lyd mad mdl mga mgf mkd mlf mmk mnt mop mro mtl mur mvr mwk mxn mxv myr mzm mzn nad ngn nio nlg nok npr nzd omr pab pen pgk php pkr pln pte pyg qar rol ron rsd rub rur rwf sar sbd scr sdd sdg sek sgd shp sit skk sll sos srd srg ssp std svc syp szl thb tjs tmm tmt tnd top tpe trl try ttd twd tzs uah ugx usd usn uss uyu uzs veb vnd vuv wst xaf xag xau xcd xof xpd xpf xpt yer yum zar zmk zwd zwl) - -foreach (_current_CURRENCY ${listCurrency}) - install(FILES ${_current_CURRENCY}.desktop DESTINATION ${LOCALE_INSTALL_DIR}/currency) -endforeach(_current_CURRENCY ${listCurrency}) +install( + FILES + adf.desktop + adp.desktop + aed.desktop + afa.desktop + afn.desktop + all.desktop + amd.desktop + ang.desktop + aoa.desktop + aon.desktop + ars.desktop + ats.desktop + aud.desktop + awg.desktop + azm.desktop + azn.desktop + bam.desktop + bbd.desktop + bdt.desktop + bef.desktop + bgl.desktop + bgn.desktop + bhd.desktop + bif.desktop + bmd.desktop + bnd.desktop + bob.desktop + bov.desktop + brl.desktop + bsd.desktop + btn.desktop + bwp.desktop + byr.desktop + bzd.desktop + cad.desktop + cdf.desktop + chf.desktop + clf.desktop + clp.desktop + cny.desktop + cop.desktop + cou.desktop + crc.desktop + cuc.desktop + cup.desktop + cve.desktop + cyp.desktop + czk.desktop + dem.desktop + djf.desktop + dkk.desktop + dop.desktop + dzd.desktop + eek.desktop + egp.desktop + ern.desktop + esp.desktop + etb.desktop + eur.desktop + fim.desktop + fjd.desktop + fkp.desktop + frf.desktop + gbp.desktop + gel.desktop + ghc.desktop + ghs.desktop + gip.desktop + gmd.desktop + gnf.desktop + grd.desktop + gtq.desktop + gwp.desktop + gyd.desktop + hkd.desktop + hnl.desktop + hrk.desktop + htg.desktop + huf.desktop + idr.desktop + iep.desktop + ils.desktop + inr.desktop + iqd.desktop + irr.desktop + isk.desktop + itl.desktop + jmd.desktop + jod.desktop + jpy.desktop + kes.desktop + kgs.desktop + khr.desktop + kmf.desktop + kpw.desktop + krw.desktop + kwd.desktop + kyd.desktop + kzt.desktop + lak.desktop + lbp.desktop + lkr.desktop + lrd.desktop + lsl.desktop + ltl.desktop + luf.desktop + lvl.desktop + lyd.desktop + mad.desktop + mdl.desktop + mga.desktop + mgf.desktop + mkd.desktop + mlf.desktop + mmk.desktop + mnt.desktop + mop.desktop + mro.desktop + mtl.desktop + mur.desktop + mvr.desktop + mwk.desktop + mxn.desktop + mxv.desktop + myr.desktop + mzm.desktop + mzn.desktop + nad.desktop + ngn.desktop + nio.desktop + nlg.desktop + nok.desktop + npr.desktop + nzd.desktop + omr.desktop + pab.desktop + pen.desktop + pgk.desktop + php.desktop + pkr.desktop + pln.desktop + pte.desktop + pyg.desktop + qar.desktop + rol.desktop + ron.desktop + rsd.desktop + rub.desktop + rur.desktop + rwf.desktop + sar.desktop + sbd.desktop + scr.desktop + sdd.desktop + sdg.desktop + sek.desktop + sgd.desktop + shp.desktop + sit.desktop + skk.desktop + sll.desktop + sos.desktop + srd.desktop + srg.desktop + ssp.desktop + std.desktop + svc.desktop + syp.desktop + szl.desktop + thb.desktop + tjs.desktop + tmm.desktop + tmt.desktop + tnd.desktop + top.desktop + tpe.desktop + trl.desktop + try.desktop + ttd.desktop + twd.desktop + tzs.desktop + uah.desktop + ugx.desktop + usd.desktop + usn.desktop + uss.desktop + uyu.desktop + uzs.desktop + veb.desktop + vnd.desktop + vuv.desktop + wst.desktop + xaf.desktop + xag.desktop + xau.desktop + xcd.desktop + xof.desktop + xpd.desktop + xpf.desktop + xpt.desktop + yer.desktop + yum.desktop + zar.desktop + zmk.desktop + zwd.desktop + zwl.desktop + DESTINATION ${LOCALE_INSTALL_DIR}/currency +) -- 2.11.0