From 9cb8e7a93728386cdb11e85d67fc73cc06f481cb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 26 Mar 2021 21:40:56 +0200 Subject: [PATCH] generic: move find_package() calls to top-level build file reference: https://github.com/fluxer/katana/issues/7 Signed-off-by: Ivailo Monev --- CMakeLists.txt | 359 +++++++++++++++-------- cursors/src/setup.cmake | 2 +- kcontrol/input/CMakeLists.txt | 12 +- kcontrol/randr/CMakeLists.txt | 8 +- kinfocenter/Modules/CMakeLists.txt | 16 - kioslave/CMakeLists.txt | 28 -- kioslave/filter/CMakeLists.txt | 34 +-- kioslave/floppy/CMakeLists.txt | 6 - kioslave/thumbnail/CMakeLists.txt | 14 - klipper/CMakeLists.txt | 8 - kscreensaver/kdesavers/CMakeLists.txt | 2 +- ksmserver/CMakeLists.txt | 2 +- ksysguard/ksysguardd/CMakeLists.txt | 5 - plasma/runners/calculator/CMakeLists.txt | 48 ++- solid-networkstatus/kded/CMakeLists.txt | 7 - 15 files changed, 285 insertions(+), 266 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84b0ded9..9d638104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,43 +14,34 @@ set_package_properties(ZLIB PROPERTIES TYPE REQUIRED ) -macro_optional_find_package(DBusMenuQt 0.6.0) -set_package_properties(DBusMenuQt PROPERTIES - DESCRIPTION "Support for notification area menus via the DBusMenu protocol" - URL "https://launchpad.net/libdbusmenu-qt" - TYPE RECOMMENDED +find_package(LibGcrypt 1.5.0) +set_package_properties(LibGcrypt PROPERTIES + DESCRIPTION "general purpose cryptographic library based on the code from GnuPG" + URL "https://www.gnu.org/software/libgcrypt/" + PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing" + TYPE REQUIRED ) -macro_optional_find_package(Strigi 0.6.3) -set_package_properties(Strigi PROPERTIES - DESCRIPTION "Desktop indexing and search support" - URL "http://strigi.sourceforge.net" - PURPOSE "Fonts analyzer" - TYPE RECOMMENDED +find_package(JPEG) +set_package_properties(JPEG PROPERTIES + DESCRIPTION "Accelerated JPEG image codec" + URL "http://libjpeg-turbo.virtualgl.org/" + TYPE REQUIRED ) -macro_optional_find_package(OpenGL) -set_package_properties(OpenGL PROPERTIES - DESCRIPTION "The OpenGL libraries" - URL "http://www.opengl.org" - PURPOSE "3D screensavers and OpenGL info module" - TYPE OPTIONAL +find_package(PNG) +set_package_properties(PNG PROPERTIES + DESCRIPTION "An Open, Extensible Image Format with Lossless Compression" + URL "http://www.libpng.org/" + TYPE REQUIRED ) -macro_optional_find_package(OpenGLES) -set_package_properties(OpenGLES PROPERTIES - DESCRIPTION "The OpenGLES libraries" - URL "http://www.khronos.org/opengles" - TYPE OPTIONAL - PURPOSE "OpenGL ES info module" -) - -macro_optional_find_package(LibDRM) -set_package_properties(LibDRM PROPERTIES - DESCRIPTION "Userspace interface to kernel DRM services" - URL "https://dri.freedesktop.org/wiki/" - TYPE OPTIONAL - PURPOSE "OpenGL info module" +find_package(Perl) +set_package_properties(Perl PROPERTIES + DESCRIPTION "Highly capable, feature-rich programming language" + URL "http://www.perl.org" + PURPOSE "Needed for KDM config handler generator" + TYPE REQUIRED ) if(Q_WS_X11) @@ -104,6 +95,45 @@ if(Q_WS_X11) endif() endif(Q_WS_X11) +macro_optional_find_package(DBusMenuQt 0.6.0) +set_package_properties(DBusMenuQt PROPERTIES + DESCRIPTION "Support for notification area menus via the DBusMenu protocol" + URL "https://launchpad.net/libdbusmenu-qt" + TYPE RECOMMENDED +) + +macro_optional_find_package(Strigi 0.6.3) +set_package_properties(Strigi PROPERTIES + DESCRIPTION "Desktop indexing and search support" + URL "http://strigi.sourceforge.net" + PURPOSE "Fonts analyzer" + TYPE RECOMMENDED +) + +macro_optional_find_package(OpenGL) +set_package_properties(OpenGL PROPERTIES + DESCRIPTION "The OpenGL libraries" + URL "http://www.opengl.org" + PURPOSE "3D screensavers and OpenGL info module" + TYPE OPTIONAL +) + +macro_optional_find_package(OpenGLES) +set_package_properties(OpenGLES PROPERTIES + DESCRIPTION "The OpenGLES libraries" + URL "http://www.khronos.org/opengles" + TYPE OPTIONAL + PURPOSE "OpenGL ES info module" +) + +macro_optional_find_package(LibDRM) +set_package_properties(LibDRM PROPERTIES + DESCRIPTION "Userspace interface to kernel DRM services" + URL "https://dri.freedesktop.org/wiki/" + TYPE OPTIONAL + PURPOSE "OpenGL info module" +) + macro_optional_find_package(Freetype) set_package_properties(Freetype PROPERTIES DESCRIPTION "Freely available software library to render fonts" @@ -120,28 +150,6 @@ set_package_properties(Fontconfig PROPERTIES TYPE OPTIONAL ) -find_package(LibGcrypt 1.5.0) -set_package_properties(LibGcrypt PROPERTIES - DESCRIPTION "general purpose cryptographic library based on the code from GnuPG" - URL "https://www.gnu.org/software/libgcrypt/" - PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing" - TYPE REQUIRED -) - -find_package(JPEG) -set_package_properties(JPEG PROPERTIES - DESCRIPTION "Accelerated JPEG image codec" - URL "http://libjpeg-turbo.virtualgl.org/" - TYPE REQUIRED -) - -find_package(PNG) -set_package_properties(PNG PROPERTIES - DESCRIPTION "An Open, Extensible Image Format with Lossless Compression" - URL "http://www.libpng.org/" - TYPE REQUIRED -) - macro_optional_find_package(LibGPS) set_package_properties(LibGPS PROPERTIES DESCRIPTION "GPSes/AIS service library" @@ -158,14 +166,126 @@ set_package_properties(LibKonq PROPERTIES TYPE OPTIONAL ) -find_package(Perl) -set_package_properties(Perl PROPERTIES - DESCRIPTION "Highly capable, feature-rich programming language" - URL "http://www.perl.org" - PURPOSE "Needed for KDM config handler generator" - TYPE REQUIRED +macro_optional_find_package(Prison QUIET CONFIG) +set_package_properties(Prison PROPERTIES + DESCRIPTION "Prison library" + URL "http://projects.kde.org/prison" + TYPE OPTIONAL + PURPOSE "Needed to create mobile barcodes from clipboard data" ) +macro_optional_find_package(LibUSB) +set_package_properties(LibUSB PROPERTIES + DESCRIPTION "User level access to USB devices" + URL "http://libusb.sourceforge.net" + TYPE OPTIONAL + PURPOSE "Provides Logitech mouse support in KControl." +) + +macro_optional_find_package(PCIUTILS) +set_package_properties(PCIUTILS PROPERTIES + DESCRIPTION "PciUtils is a library for direct access to PCI slots" + URL "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" + TYPE OPTIONAL + PURPOSE "View PCI details in kinfocenter." +) + +macro_optional_find_package(RAW1394) +set_package_properties(RAW1394 PROPERTIES + DESCRIPTION "library for direct access to IEEE 1394 bus" + URL "http://www.linux1394.org/" + TYPE OPTIONAL + PURPOSE "View FireWire devices in kinfocenter." +) + +# we need a version of samba which has already smbc_set_context(), Alex +set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE) +set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE) +macro_optional_find_package(Samba) +set_package_properties(Samba PROPERTIES + DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()" + URL "http://www.samba.org" + TYPE OPTIONAL + PURPOSE "Needed to build the SMB kioslave" +) + +macro_optional_find_package(LibSSH 0.6.0) +set_package_properties(LibSSH PROPERTIES + DESCRIPTION "the SSH library with SFTP support" + URL "http://www.libssh.org/" + TYPE OPTIONAL + PURPOSE "Needed to build the SFTP kioslave" +) + +macro_optional_find_package(Mtp 1.1.2) +set_package_properties(Mtp PROPERTIES + DESCRIPTION "the library implementation of the Media Transfer Protocol" + URL "http://libmtp.sourceforge.net/" + TYPE OPTIONAL + PURPOSE "Needed to build the MTP kioslave" +) + +macro_optional_find_package(BZip2) +set_package_properties(BZip2 PROPERTIES + DESCRIPTION "A high-quality data compressor" + URL "http://www.bzip.org" + TYPE OPTIONAL + PURPOSE "Provides the ability to read and write bzip2 compressed data files in the filter kioslave." +) + +macro_optional_find_package(LibLZMA) +set_package_properties(LibLZMA PROPERTIES + DESCRIPTION "A very high compression ratio data compressor" + URL "http://tukaani.org/xz/" + TYPE OPTIONAL + PURPOSE "Provides the ability to read and write xz compressed data files." +) + +macro_optional_find_package(OpenEXR) +set_package_properties(OpenEXR PROPERTIES + DESCRIPTION "API for accessing OpenEXR formatted images" + URL "http://www.openexr.com" + PURPOSE "Provides support for OpenEXR formatted images in the thumbnail kioslave" + TYPE OPTIONAL +) + +macro_optional_find_package(Sensors) +set_package_properties(Sensors PROPERTIES + DESCRIPTION "Linux hardware monitoring" + URL "https://hwmon.wiki.kernel.org/lm_sensors" + PURPOSE "Sensors feedback in ksysguard" + TYPE OPTIONAL +) + +macro_optional_find_package(Qalculate) +set_package_properties(Qalculate PROPERTIES + DESCRIPTION "Qalculate Library" + URL "http://qalculate.sourceforge.net" + TYPE OPTIONAL + PURPOSE "Needed to enable advanced features of the calculator runner" +) + +macro_optional_find_package(NetworkManager) +set_package_properties(NetworkManager PROPERTIES + DESCRIPTION "The NetworkManager headers" + URL "http://projects.gnome.org/NetworkManager" + TYPE OPTIONAL + PURPOSE "Needed for kded's networkstatus module" +) + +find_program(WRESTOOL_EXECUTABLE wrestool) +add_feature_info(wrestool + WRESTOOL_EXECUTABLE + "ICO thumbnails support in KIO slave" +) + +find_program(MTOOLS_EXECUTABLES NAMES mdir mmd mdel mrd mren mcopy) +add_feature_info(mtools + MTOOLS_EXECUTABLES + "KIO floppy support" +) + + check_include_files(sys/wait.h HAVE_SYS_WAIT_H) check_include_files(sys/time.h HAVE_SYS_TIME_H) @@ -186,92 +306,91 @@ add_subdirectory(libs) # pictures add_subdirectory(pics) -macro_optional_add_subdirectory(systemsettings ) +add_subdirectory(systemsettings) # core apps -macro_optional_add_subdirectory(kcheckpass) -macro_optional_add_subdirectory(kwin) -macro_optional_add_subdirectory(ksmserver) +add_subdirectory(kcheckpass) +add_subdirectory(kwin) +add_subdirectory(ksmserver) -macro_optional_add_subdirectory(ksplash) +add_subdirectory(ksplash) -macro_optional_add_subdirectory(powerdevil) -macro_optional_add_subdirectory(qguiplatformplugin_kde) -macro_optional_add_subdirectory(ksysguard) +add_subdirectory(powerdevil) +add_subdirectory(qguiplatformplugin_kde) +add_subdirectory(ksysguard) -macro_optional_add_subdirectory(kcontrol) -macro_optional_add_subdirectory(klipper) -macro_optional_add_subdirectory(kmenuedit) -macro_optional_add_subdirectory(krunner) -macro_optional_add_subdirectory(solid-actions-kcm) -macro_optional_add_subdirectory(kstartupconfig) -macro_optional_add_subdirectory(freespacenotifier) -macro_optional_add_subdirectory(kscreensaver) -macro_optional_add_subdirectory(kinfocenter) +add_subdirectory(kcontrol) +add_subdirectory(klipper) +add_subdirectory(kmenuedit) +add_subdirectory(krunner) +add_subdirectory(solid-actions-kcm) +add_subdirectory(kstartupconfig) +add_subdirectory(freespacenotifier) +add_subdirectory(kscreensaver) +add_subdirectory(kinfocenter) if(Q_WS_X11 AND X11_Xinput_FOUND) - macro_optional_add_subdirectory(ktouchpadenabler) + add_subdirectory(ktouchpadenabler) endif(Q_WS_X11 AND X11_Xinput_FOUND) -macro_optional_add_subdirectory(kcminit) -macro_optional_add_subdirectory(khotkeys) -macro_optional_add_subdirectory(kwrited) -macro_optional_add_subdirectory(ksystraycmd) -macro_optional_add_subdirectory(appmenu) +add_subdirectory(kcminit) +add_subdirectory(khotkeys) +add_subdirectory(ksystraycmd) +add_subdirectory(appmenu) if(X11_Xau_FOUND AND X11_Xdmcp_FOUND) - macro_optional_add_subdirectory( kdm ) + add_subdirectory( kdm ) else(X11_Xau_FOUND AND X11_Xdmcp_FOUND) message(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile") endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND) # data -macro_optional_add_subdirectory(cursors) +add_subdirectory(cursors) -macro_optional_add_subdirectory(plasma) -macro_optional_add_subdirectory(statusnotifierwatcher) -macro_optional_add_subdirectory(kstyles) +add_subdirectory(plasma) +add_subdirectory(statusnotifierwatcher) +add_subdirectory(kstyles) # imported from kde-runtime and other sub-projects -macro_optional_add_subdirectory(menu) -macro_optional_add_subdirectory(kwalletd) -macro_optional_add_subdirectory(kwalletmanager) -macro_optional_add_subdirectory(knotify) -macro_optional_add_subdirectory(kuiserver) -macro_optional_add_subdirectory(soliduiserver) -macro_optional_add_subdirectory(solidautoeject) -macro_optional_add_subdirectory(solid-device-automounter) -macro_optional_add_subdirectory(solid-networkstatus) -macro_optional_add_subdirectory(kcmshell) -macro_optional_add_subdirectory(kioslave) -macro_optional_add_subdirectory(kurifilter-plugins) -macro_optional_add_subdirectory(renamedlgplugins) -macro_optional_add_subdirectory(kquitapp) +add_subdirectory(menu) +add_subdirectory(kwalletd) +add_subdirectory(kwalletmanager) +add_subdirectory(knotify) +add_subdirectory(kuiserver) +add_subdirectory(soliduiserver) +add_subdirectory(solidautoeject) +add_subdirectory(solid-device-automounter) +add_subdirectory(solid-networkstatus) +add_subdirectory(kcmshell) +add_subdirectory(kioslave) +add_subdirectory(kurifilter-plugins) +add_subdirectory(renamedlgplugins) +add_subdirectory(kquitapp) if (Q_WS_X11) - macro_optional_add_subdirectory(kstart) + add_subdirectory(kstart) endif (Q_WS_X11) # Background processes -macro_optional_add_subdirectory(kpasswdserver) -macro_optional_add_subdirectory(kdontchangethehostname) -macro_optional_add_subdirectory(kglobalaccel) -macro_optional_add_subdirectory(ktimezoned) +add_subdirectory(kpasswdserver) +add_subdirectory(kdontchangethehostname) +add_subdirectory(kglobalaccel) +add_subdirectory(ktimezoned) # Command-line tools (e.g. for shell scripts) -macro_optional_add_subdirectory(kdeeject) -macro_optional_add_subdirectory(kfile) -macro_optional_add_subdirectory(kiconfinder) -macro_optional_add_subdirectory(kioclient) -macro_optional_add_subdirectory(kioexec) -macro_optional_add_subdirectory(ktraderclient) -macro_optional_add_subdirectory(kreadconfig) -macro_optional_add_subdirectory(kmimetypefinder) +add_subdirectory(kdeeject) +add_subdirectory(kfile) +add_subdirectory(kiconfinder) +add_subdirectory(kioclient) +add_subdirectory(kioexec) +add_subdirectory(ktraderclient) +add_subdirectory(kreadconfig) +add_subdirectory(kmimetypefinder) # UI Helper applications -macro_optional_add_subdirectory(drkonqi) -macro_optional_add_subdirectory(knetattach) -macro_optional_add_subdirectory(keditfiletype) +add_subdirectory(drkonqi) +add_subdirectory(knetattach) +add_subdirectory(keditfiletype) # Default settings, content and config -macro_optional_add_subdirectory(l10n) -macro_optional_add_subdirectory(localization) -macro_optional_add_subdirectory(kde-menu) +add_subdirectory(l10n) +add_subdirectory(localization) +add_subdirectory(kde-menu) ########### install files ############### # install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR}) diff --git a/cursors/src/setup.cmake b/cursors/src/setup.cmake index 8817b517..22f1b4e5 100644 --- a/cursors/src/setup.cmake +++ b/cursors/src/setup.cmake @@ -1,4 +1,4 @@ -set(setuptools tar inkspace xcursorgen) +set(setuptools tar xcursorgen) foreach(tool ${setuptools}) string(TOUPPER ${tool} uppertool) find_program(${uppertool} ${tool}) diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index 0d8a2b05..c70c3d16 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -1,16 +1,12 @@ add_subdirectory( pics ) -macro_optional_find_package(LibUSB) macro_bool_to_01(LIBUSB_FOUND HAVE_LIBUSB) -set_package_properties(LibUSB PROPERTIES - DESCRIPTION "User level access to USB devices" - URL "http://libusb.sourceforge.net" - TYPE OPTIONAL - PURPOSE "Provides Logitech mouse support in KControl." -) -configure_file (config-kcontrol-input.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcontrol-input.h ) +configure_file ( + config-kcontrol-input.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config-kcontrol-input.h +) include_directories( ${KDE4_INCLUDES} ) diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 5f3f4b98..eb8cdcdb 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -1,10 +1,12 @@ if( XRANDR_1_2_FOUND ) - macro_optional_add_subdirectory(module) + add_subdirectory(module) endif( XRANDR_1_2_FOUND ) -configure_file (config-randr.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config-randr.h ) +configure_file( + config-randr.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config-randr.h +) include_directories( ${X11_Xrandr_INCLUDE_PATH} ) diff --git a/kinfocenter/Modules/CMakeLists.txt b/kinfocenter/Modules/CMakeLists.txt index 83e597ed..a19b6f91 100644 --- a/kinfocenter/Modules/CMakeLists.txt +++ b/kinfocenter/Modules/CMakeLists.txt @@ -17,24 +17,8 @@ else() message(STATUS "OpenGL/ES2.0 information module has been disabled.") endif() -macro_optional_find_package(PCIUTILS) -set_package_properties(PCIUTILS PROPERTIES - DESCRIPTION "PciUtils is a library for direct access to PCI slots" - URL "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" - TYPE OPTIONAL - PURPOSE "View PCI details in kinfocenter." -) - add_subdirectory( pci ) -macro_optional_find_package(RAW1394) -set_package_properties(RAW1394 PROPERTIES - DESCRIPTION "library for direct access to IEEE 1394 bus" - URL "http://www.linux1394.org/" - TYPE OPTIONAL - PURPOSE "View FireWire devices in kinfocenter." -) - if(RAW1394_FOUND) add_subdirectory( view1394 ) endif(RAW1394_FOUND) diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt index 74ce4b6e..2ddb5bde 100644 --- a/kioslave/CMakeLists.txt +++ b/kioslave/CMakeLists.txt @@ -1,31 +1,3 @@ - -# we need a version of samba which has already smbc_set_context(), Alex -set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE) -set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE) -macro_optional_find_package(Samba) -set_package_properties(Samba PROPERTIES - DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()" - URL "http://www.samba.org" - TYPE OPTIONAL - PURPOSE "Needed to build the SMB kioslave" -) - -macro_optional_find_package(LibSSH 0.6.0) -set_package_properties(LibSSH PROPERTIES - DESCRIPTION "the SSH library with SFTP support" - URL "http://www.libssh.org/" - TYPE OPTIONAL - PURPOSE "Needed to build the SFTP kioslave" -) - -macro_optional_find_package(Mtp 1.1.2) -set_package_properties(Mtp PROPERTIES - DESCRIPTION "the library implementation of the Media Transfer Protocol" - URL "http://libmtp.sourceforge.net/" - TYPE OPTIONAL - PURPOSE "Needed to build the MTP kioslave" -) - add_subdirectory( bookmarks ) add_subdirectory( filter ) add_subdirectory( archive ) diff --git a/kioslave/filter/CMakeLists.txt b/kioslave/filter/CMakeLists.txt index da08e441..75745e1c 100644 --- a/kioslave/filter/CMakeLists.txt +++ b/kioslave/filter/CMakeLists.txt @@ -1,18 +1,4 @@ -macro_optional_find_package(BZip2) -set_package_properties(BZip2 PROPERTIES DESCRIPTION "A high-quality data compressor" - URL "http://www.bzip.org" - TYPE OPTIONAL - PURPOSE "Provides the ability to read and write bzip2 compressed data files in the filter kioslave." - ) - -macro_optional_find_package(LibLZMA) -set_package_properties(LibLZMA PROPERTIES DESCRIPTION "A very high compression ratio data compressor" - URL "http://tukaani.org/xz/" - TYPE OPTIONAL - PURPOSE "Provides the ability to read and write xz compressed data files." - ) - ########### next target ############### set(kio_filter_PART_SRCS filter.cc) @@ -28,11 +14,21 @@ install(TARGETS kio_filter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES gzip.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) +install( + FILES gzip.protocol + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} +) + if(BZIP2_FOUND) -install( FILES bzip.protocol bzip2.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -endif(BZIP2_FOUND) + install( + FILES bzip.protocol bzip2.protocol + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} + ) +endif() if(LIBLZMA_FOUND) -install( FILES lzma.protocol xz.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} ) -endif(LIBLZMA_FOUND) + install( + FILES lzma.protocol xz.protocol + DESTINATION ${KDE4_SERVICES_INSTALL_DIR} + ) +endif() diff --git a/kioslave/floppy/CMakeLists.txt b/kioslave/floppy/CMakeLists.txt index 7d46ef8d..78dc0e0c 100644 --- a/kioslave/floppy/CMakeLists.txt +++ b/kioslave/floppy/CMakeLists.txt @@ -1,9 +1,3 @@ -find_program(MTOOLS_EXECUTABLES NAMES mdir mmd mdel mrd mren mcopy) -add_feature_info( - "mtools" - MTOOLS_EXECUTABLES - "KIO floppy support" -) ########### next target ############### diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index e863ec6a..a3a6df87 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -1,17 +1,3 @@ -macro_optional_find_package(OpenEXR) -set_package_properties(OpenEXR PROPERTIES - DESCRIPTION "API for accessing OpenEXR formatted images" - URL "http://www.openexr.com" - PURPOSE "Provides support for OpenEXR formatted images in the thumbnail kioslave" - TYPE OPTIONAL -) - -find_program(WRESTOOL_EXECUTABLE wrestool) -add_feature_info(wrestool - WRESTOOL_EXECUTABLE - "ICO thumbnails support in KIO slave" -) - ########### next target ############### set(kio_thumbnail_PART_SRCS thumbnail.cpp imagefilter.cpp) diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index bd0e84e9..8e9717ec 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -17,14 +17,6 @@ set(libklipper_common_SRCS editactiondialog.ui ) -macro_optional_find_package(Prison QUIET CONFIG) -set_package_properties(Prison PROPERTIES - DESCRIPTION "Prison library" - URL "http://projects.kde.org/prison" - TYPE OPTIONAL - PURPOSE "Needed to create mobile barcodes from clipboard data" -) - if (PRISON_FOUND) add_definitions(-DHAVE_PRISON) include_directories(${PRISON_INCLUDE_DIR}) diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt index eb058f59..cbc370f6 100644 --- a/kscreensaver/kdesavers/CMakeLists.txt +++ b/kscreensaver/kdesavers/CMakeLists.txt @@ -1,4 +1,4 @@ -macro_optional_add_subdirectory( asciiquarium ) +add_subdirectory( asciiquarium ) SET(LIBMATH "m") diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 4ce8c688..191c5433 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -12,7 +12,7 @@ if(ENABLE_TESTING) add_subdirectory(tests) endif() -macro_optional_add_subdirectory( screenlocker ) +add_subdirectory( screenlocker ) set(COMPILE_SCREEN_LOCKER 1) set(SCREEN_LOCKER "screenlocker_static") diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index f1136aab..0d60555a 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -1,7 +1,3 @@ -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - cmake_minimum_required(VERSION 2.6.2) -endif() - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ ) # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc @@ -9,7 +5,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ ) # into kde 3.x it was installed into /etc/ add_definitions( -DKSYSGUARDDRCFILE="\\"${KDE4_SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" ) -macro_optional_find_package(Sensors) macro_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS) configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h) diff --git a/plasma/runners/calculator/CMakeLists.txt b/plasma/runners/calculator/CMakeLists.txt index 70243b44..01269066 100644 --- a/plasma/runners/calculator/CMakeLists.txt +++ b/plasma/runners/calculator/CMakeLists.txt @@ -1,45 +1,35 @@ ########### next target ############### -macro_optional_find_package(Qalculate) -set_package_properties(Qalculate PROPERTIES - DESCRIPTION "Qalculate Library" - URL "http://qalculate.sourceforge.net" - TYPE OPTIONAL - PURPOSE "Needed to enable advanced features of the calculator runner" -) - -if ( QALCULATE_FOUND ) - include_directories(${QALCULATE_INCLUDE_DIR}) - add_definitions(-DENABLE_QALCULATE) - - set(qalculate_engine_SRCS - qalculate_engine.cpp - ) - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -Wno-deprecated") -endif( QALCULATE_FOUND ) - set(krunner_calculatorrunner_SRCS calculatorrunner.cpp ) if ( QALCULATE_FOUND ) - kde4_add_plugin(krunner_calculatorrunner ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS}) + include_directories(${QALCULATE_INCLUDE_DIR}) + add_definitions(-DENABLE_QALCULATE) + + set(krunner_calculatorrunner_SRCS + ${krunner_calculatorrunner_SRCS} + qalculate_engine.cpp + ) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -Wno-deprecated") +endif( QALCULATE_FOUND ) + +kde4_add_plugin(krunner_calculatorrunner ${krunner_calculatorrunner_SRCS}) +target_link_libraries(krunner_calculatorrunner + ${KDE4_KDEUI_LIBS} + ${KDE4_PLASMA_LIBS} + ${QT_QTSCRIPT_LIBRARY} +) + +if ( QALCULATE_FOUND ) target_link_libraries(krunner_calculatorrunner ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} ${QALCULATE_LIBRARIES} ) -else ( QALCULATE_FOUND ) - kde4_add_plugin(krunner_calculatorrunner ${krunner_calculatorrunner_SRCS}) - target_link_libraries(krunner_calculatorrunner - ${KDE4_KDEUI_LIBS} - ${KDE4_PLASMA_LIBS} - ${QT_QTSCRIPT_LIBRARY} - ) endif ( QALCULATE_FOUND ) install(TARGETS krunner_calculatorrunner DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}) diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt index 050fe5d2..89c520b4 100644 --- a/solid-networkstatus/kded/CMakeLists.txt +++ b/solid-networkstatus/kded/CMakeLists.txt @@ -8,13 +8,6 @@ set(kded_networkstatus_PART_SRCS wicdcustomtypes.cpp ) -macro_optional_find_package(NetworkManager) -set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager headers" - URL "http://projects.gnome.org/NetworkManager" - TYPE OPTIONAL - PURPOSE "Needed for kded's networkstatus module" - ) - if(NETWORKMANAGER_FOUND) if(${NETWORKMANAGER_VERSION} VERSION_EQUAL "0.7.0" OR ${NETWORKMANAGER_VERSION} VERSION_GREATER "0.7.0")