From 505c7b43e2b1e831a99d23a6d12ce649782064ea Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 15:09:02 +0200 Subject: Fixing CMakeLists to find webkitkde --- CMakeLists.txt | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index de3f8109..5924fbb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ PROJECT( rekonq ) # rekonq info SET(REKONQ_MAJOR_VERSION "0") SET(REKONQ_MINOR_VERSION "1") -SET(REKONQ_PATCH_VERSION "0") +SET(REKONQ_PATCH_VERSION "1") SET(REKONQ_VERSION_STR "${REKONQ_MAJOR_VERSION}.${REKONQ_MINOR_VERSION}.${REKONQ_PATCH_VERSION}" @@ -30,6 +30,8 @@ FIND_PACKAGE(Qt4 REQUIRED) SET(KDE_MIN_VERSION 4.2.0) FIND_PACKAGE(KDE4 REQUIRED) +FIND_PACKAGE(KdeWebKit REQUIRED) + INCLUDE(MacroOptionalFindPackage) INCLUDE(FindPackageHandleStandardArgs) INCLUDE(KDE4Defaults) @@ -44,6 +46,7 @@ MESSAGE(STATUS " rekonq ${REKONQ_VERSION_STR} dependencies results <${REKONQ_SI # Require shared libraries results. +# ----------------- Qt SET(QT_VERS_STR "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" ) @@ -62,15 +65,51 @@ ENDIF(QT_FOUND) MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") -# Optional plugins results. -IF(QT_FOUND) +# -------------- KDE +SET(KDE_VERS_STR + "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_PATCH}" + ) + +IF(KDE4_FOUND) + MESSAGE(STATUS " KDE Desktop Environment............... YES") + MESSAGE(STATUS " KDE version ${KDE_VERS_STR} found! ") +ELSE(KDE4_FOUND) + MESSAGE(STATUS " KDE Desktop Environment............... NO") + MESSAGE(STATUS "") + MESSAGE(SEND_ERROR " rekonq needs at least KDE ${KDE_MIN_VERSION}. Please install it and try compiling again.") + MESSAGE(STATUS " KDE website is at http://www.kde.org") + MESSAGE(STATUS "") +ENDIF(KDE4_FOUND) + +MESSAGE(STATUS "----------------------------------------------------------------------------------") +MESSAGE(STATUS "") + + +# ---------------- KdeWebkit +IF(KDEWEBKIT_FOUND) + MESSAGE(STATUS " KDE Webkit library found............... YES") +ELSE(KDEWEBKIT_FOUND) + MESSAGE(STATUS " KDE Webkit library found............... NO") + MESSAGE(STATUS "") + MESSAGE(SEND_ERROR " rekonq needs, from version 0.2, KDEWEBKIT to be compiled. Please install it and try compiling again.") + MESSAGE(STATUS " You can actually retrieve it from playground/libs/webkitkde KDE svn") + MESSAGE(STATUS "") +ENDIF(KDEWEBKIT_FOUND) + +MESSAGE(STATUS "----------------------------------------------------------------------------------") +MESSAGE(STATUS "") + + +##### FINAL RESULTS ##### + +IF(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) MESSAGE(STATUS " rekonq will be compiled....... YES") SET(REKONQ_CAN_BE_COMPILED true) -ELSE(QT_FOUND) +ELSE(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!") SET(REKONQ_CAN_BE_COMPILED false) -ENDIF(QT_FOUND) +ENDIF(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") -- cgit v1.2.1 From f0fd61b5e50c3495acd977d594c5507ffdd5fbd9 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 15:14:03 +0200 Subject: CMakeLists.. --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5924fbb8..393910cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,13 +103,13 @@ MESSAGE(STATUS "") ##### FINAL RESULTS ##### -IF(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) +IF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) MESSAGE(STATUS " rekonq will be compiled....... YES") SET(REKONQ_CAN_BE_COMPILED true) -ELSE(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) +ELSE(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!") SET(REKONQ_CAN_BE_COMPILED false) -ENDIF(QT_FOUND AND KDE_FOUND AND KDEWEBKIT_FOUND) +ENDIF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") @@ -129,6 +129,7 @@ IF(REKONQ_CAN_BE_COMPILED) ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( icons ) ADD_SUBDIRECTORY( data ) +# ADD_SUBDIRECTORY( i18n ) # ADD_SUBDIRECTORY( doc ) ENDIF(REKONQ_CAN_BE_COMPILED) -- cgit v1.2.1 From 7aad2cdabf718b113284d5835a821c059dff5f72 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 25 May 2009 12:27:17 +0200 Subject: Fixing CMakelists.txt's --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 393910cc..a5920fcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,12 +118,13 @@ MESSAGE(STATUS "") IF(REKONQ_CAN_BE_COMPILED) - INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} + INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} + ${KDEWEBKIT_INCLUDE_DIR} ) ADD_SUBDIRECTORY( src ) -- cgit v1.2.1 From 93f6dee31f4078c868f4f24df695b32e32225276 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 28 May 2009 01:42:04 +0200 Subject: cosmetic --- CMakeLists.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a5920fcb..78c4d740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ INCLUDE(MacroLibrary) MESSAGE(STATUS "") MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS " rekonq ${REKONQ_VERSION_STR} dependencies results <${REKONQ_SITE}>") +MESSAGE(STATUS "") # Require shared libraries results. @@ -52,23 +53,21 @@ SET(QT_VERS_STR ) IF(QT_FOUND) - MESSAGE(STATUS " Qt library found............... YES") + MESSAGE(STATUS " Qt library found...................... YES") MESSAGE(STATUS " Qt version ${QT_VERS_STR} found! ") ELSE(QT_FOUND) - MESSAGE(STATUS " Qt library found............... NO") + MESSAGE(STATUS " Qt library found...................... NO") MESSAGE(STATUS "") MESSAGE(SEND_ERROR " rekonq needs at least Qt ${QT_MIN_VERSION}. Please install it and try compiling again.") MESSAGE(STATUS " Qt website is at http://www.qtsoftware.com") MESSAGE(STATUS "") ENDIF(QT_FOUND) -MESSAGE(STATUS "----------------------------------------------------------------------------------") -MESSAGE(STATUS "") - +MESSAGE(STATUS "") # ----------------------------------------------------------- # -------------- KDE SET(KDE_VERS_STR - "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_PATCH}" + "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" ) IF(KDE4_FOUND) @@ -82,21 +81,20 @@ ELSE(KDE4_FOUND) MESSAGE(STATUS "") ENDIF(KDE4_FOUND) -MESSAGE(STATUS "----------------------------------------------------------------------------------") -MESSAGE(STATUS "") - +MESSAGE(STATUS "") # ---------------------------------------------------------- # ---------------- KdeWebkit IF(KDEWEBKIT_FOUND) - MESSAGE(STATUS " KDE Webkit library found............... YES") + MESSAGE(STATUS " KDE Webkit library found.............. YES") ELSE(KDEWEBKIT_FOUND) - MESSAGE(STATUS " KDE Webkit library found............... NO") + MESSAGE(STATUS " KDE Webkit library found.............. NO") MESSAGE(STATUS "") MESSAGE(SEND_ERROR " rekonq needs, from version 0.2, KDEWEBKIT to be compiled. Please install it and try compiling again.") MESSAGE(STATUS " You can actually retrieve it from playground/libs/webkitkde KDE svn") MESSAGE(STATUS "") ENDIF(KDEWEBKIT_FOUND) +MESSAGE(STATUS "") MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") @@ -104,13 +102,14 @@ MESSAGE(STATUS "") ##### FINAL RESULTS ##### IF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) - MESSAGE(STATUS " rekonq will be compiled....... YES") + MESSAGE(STATUS " rekonq will be compiled............... YES") SET(REKONQ_CAN_BE_COMPILED true) ELSE(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!") SET(REKONQ_CAN_BE_COMPILED false) ENDIF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) +MESSAGE(STATUS "") MESSAGE(STATUS "----------------------------------------------------------------------------------") MESSAGE(STATUS "") -- cgit v1.2.1