Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source
This commit is contained in:
spm 2015-07-26 15:20:13 +03:00
parent f4850a782f
commit f1d48040a6
11 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -62,3 +62,5 @@ macro_optional_add_subdirectory (thumbnailers)
macro_optional_add_subdirectory (yakuake)
macro_optional_add_subdirectory (kdevplatform)
macro_optional_add_subdirectory (kdevelop)
macro_display_feature_log()

2
amarok/CMakeLists.txt
View file

@ -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 )

2
ark/CMakeLists.txt
View file

@ -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)

1
kdeplasma-addons/CMakeLists.txt
View file

@ -57,4 +57,3 @@ add_subdirectory(wallpapers)
add_subdirectory(containments)
add_subdirectory(cmake)
macro_display_feature_log()

5
kdevelop/CMakeLists.txt
View file

@ -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 )

2
kdevelop/debuggers/gdb/CMakeLists.txt
View file

@ -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

3
kdevelop/providers/ghprovider/CMakeLists.txt
View file

@ -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)

2
kdevplatform/CMakeLists.txt
View file

@ -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 )

7
kdevplatform/plugins/CMakeLists.txt
View file

@ -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)
# requires boost
macro_optional_add_subdirectory(classbrowser)
endif(Boost_FOUND)
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()

2
plasma-nm/CMakeLists.txt
View file

@ -63,7 +63,5 @@ add_subdirectory(libs)
add_subdirectory(vpn)
add_subdirectory(settings)
macro_display_feature_log()
include(MacroOptionalAddSubdirectory)
macro_optional_add_subdirectory( po )

1
thumbnailers/CMakeLists.txt
View file

@ -30,4 +30,3 @@ if(GETTEXTPO_FOUND)
macro_optional_add_subdirectory(po)
endif(GETTEXTPO_FOUND)
macro_display_feature_log()