diff options
Diffstat (limited to 'modules/FindKDE4Internal.cmake')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index e4e77bcc..97cf4ebf 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -206,9 +206,9 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -INCLUDE (MacroEnsureVersion) +include (MacroEnsureVersion) -cmake_minimum_required(VERSION 2.4.3 FATAL_ERROR) +cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR) set(QT_MIN_VERSION "4.2.0") #this line includes FindQt4.cmake, which searches the Qt library and headers @@ -222,11 +222,6 @@ endif (NOT QT_DBUSXML2CPP_EXECUTABLE) # Perl is required for building KDE software, find_package(Perl REQUIRED) -# remove once we require cmake >= 2.4.4, then the REQUIRED flag is honored by FindPerl.cmake, Alex -if(NOT PERL_FOUND) - message(FATAL_ERROR "Perl was not found. Make sure it has installed on your system") -endif(NOT PERL_FOUND) - include (MacroLibrary) include (CheckCXXCompilerFlag) include (CheckCXXSourceCompiles) @@ -486,7 +481,7 @@ else (_kdeBootStrapping) find_library(KDE4_KWALLETCLIENT_LIBRARY NAMES kwalletclient PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KWALLETCLIENT_LIBS ${kwalletclient_LIB_DEPENDS} ${KDE4_KWALLETCLIENT_LIBRARY} ) - + get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH ) # kpassworddialog.h is new with KDE4 |