From f1d48040a6ebfa7dc81ecc7affb5f12c24e3e82a Mon Sep 17 00:00:00 2001 From: spm Date: Sun, 26 Jul 2015 15:20:13 +0300 Subject: [PATCH] generic: misc cleanups --- CMakeLists.txt | 4 +++- amarok/CMakeLists.txt | 2 -- ark/CMakeLists.txt | 2 +- kdeplasma-addons/CMakeLists.txt | 1 - kdevelop/CMakeLists.txt | 5 +---- kdevelop/debuggers/gdb/CMakeLists.txt | 2 +- kdevelop/providers/ghprovider/CMakeLists.txt | 3 +-- kdevplatform/CMakeLists.txt | 2 +- kdevplatform/plugins/CMakeLists.txt | 9 ++------- plasma-nm/CMakeLists.txt | 2 -- thumbnailers/CMakeLists.txt | 1 - 11 files changed, 10 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e53db73f..ac1006b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,4 +61,6 @@ macro_optional_add_subdirectory (svgpart) macro_optional_add_subdirectory (thumbnailers) macro_optional_add_subdirectory (yakuake) macro_optional_add_subdirectory (kdevplatform) -macro_optional_add_subdirectory (kdevelop) \ No newline at end of file +macro_optional_add_subdirectory (kdevelop) + +macro_display_feature_log() diff --git a/amarok/CMakeLists.txt b/amarok/CMakeLists.txt index 1e712340..977028e7 100644 --- a/amarok/CMakeLists.txt +++ b/amarok/CMakeLists.txt @@ -237,8 +237,6 @@ if( WITH_PLAYER ) macro_log_feature( TAGLIB_MOD_FOUND "taglib" "Additional support for Audio metadata of mod, s3m, it and xm files." "http://developer.kde.org/~wheeler/taglib.html" FALSE "1.8" "" ) macro_log_feature( TAGLIB_OPUS_FOUND "taglib" "Additional support for Audio metadata of opus files." "http://developer.kde.org/~wheeler/taglib.html" FALSE "1.9" "" ) - macro_display_feature_log() - endif( WITH_PLAYER ) if( WITH_UTILITIES ) diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index 50e1bf7a..8366f194 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -21,7 +21,7 @@ endif() include( MacroLibrary ) macro_optional_find_package(LibArchive 3.0.3) -macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") +macro_log_feature(LibArchive_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) diff --git a/kdeplasma-addons/CMakeLists.txt b/kdeplasma-addons/CMakeLists.txt index 5cf370c4..e2ef2fb1 100644 --- a/kdeplasma-addons/CMakeLists.txt +++ b/kdeplasma-addons/CMakeLists.txt @@ -57,4 +57,3 @@ add_subdirectory(wallpapers) add_subdirectory(containments) add_subdirectory(cmake) -macro_display_feature_log() diff --git a/kdevelop/CMakeLists.txt b/kdevelop/CMakeLists.txt index b43f7053..1b80dc27 100644 --- a/kdevelop/CMakeLists.txt +++ b/kdevelop/CMakeLists.txt @@ -37,7 +37,6 @@ if("${_isSystemLibDir}" STREQUAL "-1") endif("${_isSystemLibDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) include_directories(${KDEVPLATFORM_INCLUDE_DIR}) @@ -79,13 +78,11 @@ add_subdirectory(utils) add_subdirectory(file_templates) add_subdirectory(providers) -macro_display_feature_log() - include(CTest) # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. # in the KDE build system, this is the same as CMAKE_BINARY_DIR. -configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) include(MacroOptionalAddSubdirectory) macro_optional_add_subdirectory( po ) diff --git a/kdevelop/debuggers/gdb/CMakeLists.txt b/kdevelop/debuggers/gdb/CMakeLists.txt index bf0ef804..52662d81 100644 --- a/kdevelop/debuggers/gdb/CMakeLists.txt +++ b/kdevelop/debuggers/gdb/CMakeLists.txt @@ -13,7 +13,7 @@ function(add_debuggable_executable target) endfunction() if(NOT APPLE) -macro_optional_find_package( KDE4Workspace 4.2.0 ) +macro_optional_find_package(KDE4Workspace) macro_log_feature( KDE4WORKSPACE_FOUND "KDE 4 Workspace" "KDE 4 Workspace libraries" "kdebase/workspace" FALSE diff --git a/kdevelop/providers/ghprovider/CMakeLists.txt b/kdevelop/providers/ghprovider/CMakeLists.txt index f10f9711..c057e319 100644 --- a/kdevelop/providers/ghprovider/CMakeLists.txt +++ b/kdevelop/providers/ghprovider/CMakeLists.txt @@ -1,9 +1,8 @@ project(ghprovider) -find_package(KDE4 REQUIRED) +find_package(KDE4 4.14.3 REQUIRED) include (KDE4Defaults) -find_package(KDevPlatform REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) if(NOT QJSON_FOUND) diff --git a/kdevplatform/CMakeLists.txt b/kdevplatform/CMakeLists.txt index 15d330b2..5fb07d1e 100644 --- a/kdevplatform/CMakeLists.txt +++ b/kdevplatform/CMakeLists.txt @@ -136,7 +136,7 @@ include(CTest) # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. # in the KDE build system, this is the same as CMAKE_BINARY_DIR. -configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) include(MacroOptionalAddSubdirectory) macro_optional_add_subdirectory( po ) diff --git a/kdevplatform/plugins/CMakeLists.txt b/kdevplatform/plugins/CMakeLists.txt index 7be6721e..8520f41e 100644 --- a/kdevplatform/plugins/CMakeLists.txt +++ b/kdevplatform/plugins/CMakeLists.txt @@ -30,12 +30,8 @@ add_subdirectory(projectfilter) macro_optional_add_subdirectory(dashboard) -set(Boost_ADDITIONAL_VERSIONS 1.39.0 1.39) -find_package(Boost 1.35.0) -macro_log_feature( Boost_FOUND "Boost" "Boost libraries for enabling the classbrowser" "http://www.boost.org" FALSE "1.35.0" "The boost libraries are needed to build the Class Browser" ) -if(Boost_FOUND) - macro_optional_add_subdirectory(classbrowser) -endif(Boost_FOUND) +# requires boost +macro_optional_add_subdirectory(classbrowser) find_package(SubversionLibrary) macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion integration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion libraries are needed for the Subversion support" ) @@ -48,4 +44,3 @@ if(QJSON_FOUND) macro_optional_add_subdirectory(reviewboard) endif(QJSON_FOUND) -macro_display_feature_log() diff --git a/plasma-nm/CMakeLists.txt b/plasma-nm/CMakeLists.txt index 5ccb6a26..7c9f3c9c 100644 --- a/plasma-nm/CMakeLists.txt +++ b/plasma-nm/CMakeLists.txt @@ -63,7 +63,5 @@ add_subdirectory(libs) add_subdirectory(vpn) add_subdirectory(settings) -macro_display_feature_log() - include(MacroOptionalAddSubdirectory) macro_optional_add_subdirectory( po ) diff --git a/thumbnailers/CMakeLists.txt b/thumbnailers/CMakeLists.txt index 32708d5f..d1f82b4e 100644 --- a/thumbnailers/CMakeLists.txt +++ b/thumbnailers/CMakeLists.txt @@ -30,4 +30,3 @@ if(GETTEXTPO_FOUND) macro_optional_add_subdirectory(po) endif(GETTEXTPO_FOUND) -macro_display_feature_log() \ No newline at end of file