From kde-commits Thu Jun 30 21:46:54 2011 From: Dirk Mueller Date: Thu, 30 Jun 2011 21:46:54 +0000 To: kde-commits Subject: =?utf-8?q?=5Bkde-baseapps/KDE/4=2E6=5D_/=3A_bump_version_to_4=2E?= Message-Id: <20110630214654.83258A60AE () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=130947045202451 Git commit b99a46160865524e9b0a12e84b758b6473090ed4 by Dirk Mueller. Committed on 28/04/2011 at 15:25. Pushed by mueller into branch 'KDE/4.6'. bump version to 4.6.3 M +5 -3 CMakeLists.txt http://commits.kde.org/kde-baseapps/b99a46160865524e9b0a12e84b758b6473090ed4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 03a7186..bee439a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,9 @@ project(KDEBASE_APPS) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.6.1") +set(KDE_MIN_VERSION "4.6.3") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.6.1 REQUIRED) +find_package(KDE4 4.6.3 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) @@ -28,13 +28,15 @@ add_subdirectory( keditbookmarks ) add_subdirectory( konqueror ) add_subdirectory( kfind ) add_subdirectory( plasma ) -add_subdirectory( konq-plugins ) +macro_optional_add_subdirectory( konq-plugins ) if ( Q_WS_MAC ) add_subdirectory( kdepasswd ) + macro_optional_add_subdirectory( konsole ) endif ( Q_WS_MAC ) if ( Q_WS_X11 ) + macro_optional_add_subdirectory( konsole ) add_subdirectory( nsplugins ) add_subdirectory( kdepasswd ) endif ( Q_WS_X11 )