From 104d57f827a96989a684033654297780d6f5f95e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 29 Oct 2015 08:51:30 +0200 Subject: [PATCH] generic: misc cleanups Signed-off-by: Ivailo Monev --- kdeplasma-addons/CMakeLists.txt | 7 +------ kdevplatform/CMakeLists.txt | 6 +----- kdevplatform/sublime/container.cpp | 2 +- kgpg/cmake/modules/FindGpgme.cmake | 5 +---- kompare/libkomparediff2/CMakeLists.txt | 6 +----- thumbnailers/audio/CMakeLists.txt | 5 ++--- 6 files changed, 7 insertions(+), 24 deletions(-) diff --git a/kdeplasma-addons/CMakeLists.txt b/kdeplasma-addons/CMakeLists.txt index e2ef2fb1..d37c3aec 100644 --- a/kdeplasma-addons/CMakeLists.txt +++ b/kdeplasma-addons/CMakeLists.txt @@ -29,12 +29,7 @@ macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for pa macro_optional_find_package(QtOAuth) macro_log_feature(QTOAUTH_FOUND "QtOAuth" "QtOAuth Library - required to build the Plasma Microblog DataEngine" "https://github.com/ayoy/qoauth" FALSE "" "Needed for building Plasma Microblog DataEngine") -macro_optional_depend_package(Marble "Marble") -if (DEPEND_PACKAGE_Marble) - macro_optional_find_package(Marble) -else (DEPEND_PACKAGE_Marble) - set (MARBLE_FOUND FALSE) -endif (DEPEND_PACKAGE_Marble) +macro_optional_find_package(Marble) macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.") macro_optional_find_package(DBusMenuQt) diff --git a/kdevplatform/CMakeLists.txt b/kdevplatform/CMakeLists.txt index f6e8f65c..4c539aab 100644 --- a/kdevplatform/CMakeLists.txt +++ b/kdevplatform/CMakeLists.txt @@ -108,11 +108,7 @@ macro_write_basic_cmake_version_file( ${KDevPlatform_BINARY_DIR}/KDevPlatformCon configure_file( "${KDevPlatform_SOURCE_DIR}/KDevPlatformConfig.cmake.in" "${KDevPlatform_BINARY_DIR}/KDevPlatformConfig.cmake" @ONLY ) configure_file( "${KDevPlatform_SOURCE_DIR}/kdevplatformversion.h.cmake" "${KDevPlatform_BINARY_DIR}/kdevplatformversion.h" @ONLY ) -if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_kdevplatform_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/kdevplatform") -else(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_kdevplatform_CONFIG_DEST "${LIB_INSTALL_DIR}/kdevplatform") -endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) +set(_kdevplatform_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/kdevplatform") install( FILES "${KDevPlatform_BINARY_DIR}/kdevplatformversion.h" diff --git a/kdevplatform/sublime/container.cpp b/kdevplatform/sublime/container.cpp index 2a9989fc..e7bee6e6 100644 --- a/kdevplatform/sublime/container.cpp +++ b/kdevplatform/sublime/container.cpp @@ -239,7 +239,7 @@ Container::Container(QWidget *parent) connect(d->tabBar, SIGNAL(wheelDelta(int)), this, SLOT(wheelScroll(int))); connect(d->tabBar, SIGNAL(contextMenu(int,QPoint)), this, SLOT(contextMenu(int,QPoint))); connect(d->tabBar, SIGNAL(mouseMiddleClick(int)), this, SLOT(requestClose(int))); - connect(d->tabBar, SIGNAL(mouseDoubleClick(QWidget)), this, SLOT(doubleClickTriggered(QWidget*))); + connect(d->tabBar, SIGNAL(mouseDoubleClick(QWidget*)), this, SLOT(doubleClickTriggered(QWidget*))); connect(d->documentListMenu, SIGNAL(triggered(QAction*)), this, SLOT(documentListActionTriggered(QAction*))); KConfigGroup group = KGlobal::config()->group("UiSettings"); diff --git a/kgpg/cmake/modules/FindGpgme.cmake b/kgpg/cmake/modules/FindGpgme.cmake index 3308bf59..bbb5a77b 100644 --- a/kgpg/cmake/modules/FindGpgme.cmake +++ b/kgpg/cmake/modules/FindGpgme.cmake @@ -198,10 +198,7 @@ else() # not WIN32 exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION ) - set( _GPGME_MIN_VERSION "1.0.0" ) - macro_ensure_version( ${_GPGME_MIN_VERSION} ${GPGME_VERSION} _GPGME_INSTALLED_VERSION_OK ) - - if ( NOT _GPGME_INSTALLED_VERSION_OK ) + if("${GPGME_VERSION}" VERSION_LESS "1.0.0") message( STATUS "The installed version of gpgme is too old: ${GPGME_VERSION} (required: >= ${_GPGME_MIN_VERSION})" ) diff --git a/kompare/libkomparediff2/CMakeLists.txt b/kompare/libkomparediff2/CMakeLists.txt index 4fb74d38..a7ffbb42 100644 --- a/kompare/libkomparediff2/CMakeLists.txt +++ b/kompare/libkomparediff2/CMakeLists.txt @@ -55,11 +55,7 @@ install(FILES # Config.cmake file. configure_file( "${PROJECT_SOURCE_DIR}/LibKompareDiff2Config.cmake.in" "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" @ONLY ) -if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_LibKompareDiff2_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/libkomparediff2") -else(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_LibKompareDiff2_CONFIG_DEST "${LIB_INSTALL_DIR}/libkomparediff2") -endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) +set(_LibKompareDiff2_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/libkomparediff2") install( FILES "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" diff --git a/thumbnailers/audio/CMakeLists.txt b/thumbnailers/audio/CMakeLists.txt index ff03ac3f..4249ccf4 100644 --- a/thumbnailers/audio/CMakeLists.txt +++ b/thumbnailers/audio/CMakeLists.txt @@ -18,11 +18,10 @@ if(WITH_TAGLIB) exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS AND TAGLIB_VERSION) - MACRO_ENSURE_VERSION2("1.4" ${TAGLIB_VERSION} TAGLIB_INSTALLED_VERSION_OK) - if(TAGLIB_INSTALLED_VERSION_OK) + if("${TAGLIB_VERSION}" VERSION_LESS "1.4") set(HAVE_TAGLIB 1) message(STATUS "TagLib found: ${TAGLIB_LIBRARIES}") - endif(TAGLIB_INSTALLED_VERSION_OK) + endif() endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS AND TAGLIB_VERSION) endif(TAGLIBCONFIG_EXECUTABLE) if (NOT HAVE_TAGLIB)