diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-07-15 23:57:24 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-07-15 23:57:24 +0200 |
| commit | accb6741f73118f18ee3f08e995af8febb495065 (patch) | |
| tree | 52d501ad1b4b352e44a568d5c382c920d453a03d | |
| parent | Some backports from KdeWebKit and rekonq 0.1 implementation (diff) | |
| download | rekonq-accb6741f73118f18ee3f08e995af8febb495065.tar.xz | |
Fixing CMakeLists..
| -rw-r--r-- | CMakeLists.txt | 34 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 9 |
2 files changed, 20 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61467cba..0b8162f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ FIND_PACKAGE(Qt4 REQUIRED) SET(KDE_MIN_VERSION 4.2.0) FIND_PACKAGE(KDE4 REQUIRED) -FIND_PACKAGE(KdeWebKit REQUIRED) +# FIND_PACKAGE(KdeWebKit REQUIRED) INCLUDE(MacroOptionalFindPackage) INCLUDE(FindPackageHandleStandardArgs) @@ -112,16 +112,16 @@ ENDIF(KDE4_FOUND) 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/kdewebkit KDE svn") - MESSAGE(STATUS "") -ENDIF(KDEWEBKIT_FOUND) +# # ---------------- 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/kdewebkit KDE svn") +# MESSAGE(STATUS "") +# # ENDIF(KDEWEBKIT_FOUND) # --------------- KNetworkAccessManager if(KDE_OLD_VERSION) @@ -148,23 +148,23 @@ MESSAGE(STATUS "") if(KDE_OLD_VERSION) - IF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND AND KDENETWORK_FOUND) + IF(QT_FOUND AND KDE4_FOUND AND KDENETWORK_FOUND) MESSAGE(STATUS " rekonq will be compiled............... YES") SET(REKONQ_CAN_BE_COMPILED true) - ELSE(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND AND KDENETWORK_FOUND) + ELSE(QT_FOUND AND KDE4_FOUND AND KDENETWORK_FOUND) MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!") SET(REKONQ_CAN_BE_COMPILED false) - ENDIF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND AND KDENETWORK_FOUND) + ENDIF(QT_FOUND AND KDE4_FOUND AND KDENETWORK_FOUND) else(KDE_OLD_VERSION) - IF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) + IF(QT_FOUND AND KDE4_FOUND) MESSAGE(STATUS " rekonq will be compiled............... YES") SET(REKONQ_CAN_BE_COMPILED true) - ELSE(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) + ELSE(QT_FOUND AND KDE4_FOUND) MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!") SET(REKONQ_CAN_BE_COMPILED false) - ENDIF(QT_FOUND AND KDE4_FOUND AND KDEWEBKIT_FOUND) + ENDIF(QT_FOUND AND KDE4_FOUND) endif(KDE_OLD_VERSION) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3f7544a..73ef1dc0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,7 +38,6 @@ SET( rekonq_SRCS KDE4_ADD_UI_FILES( rekonq_SRCS cookies.ui cookiesexceptions.ui - #history.ui password.ui proxy.ui settings_general.ui @@ -58,7 +57,6 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES} - ${KDEWEBKIT_INCLUDE_DIR} ) if(KDE_OLD_VERSION) @@ -70,9 +68,7 @@ endif(KDE_OLD_VERSION) ### -------------- ADDING DEFINITIONS... -ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} - ${KDEWEBKIT_DEFINITIONS} -) +ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} ) if(KDE_OLD_VERSION) @@ -92,10 +88,11 @@ KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) TARGET_LINK_LIBRARIES ( rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} + ${QT_QTWEBKIT_LIBRARY} + ${QT_QTUITOOLS_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} - ${KDEWEBKIT_LIBRARIES} ) if(KDE_OLD_VERSION) |