diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-22 15:14:03 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-22 15:14:03 +0200 |
| commit | f0fd61b5e50c3495acd977d594c5507ffdd5fbd9 (patch) | |
| tree | e4b8e30a58fda6ee26becbe622081d955b747db1 | |
| parent | Fixing CMakeLists to find webkitkde (diff) | |
| download | rekonq-f0fd61b5e50c3495acd977d594c5507ffdd5fbd9.tar.xz | |
CMakeLists..
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 5 deletions
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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a64cc747..dd7414a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,18 +41,19 @@ KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc ) ### ------------------------------------------ -ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ) +ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} ) KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) TARGET_LINK_LIBRARIES( rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} - ${QT_QTWEBKIT_LIBRARY} +# ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} + ${KDEWEBKIT_LIBRARIES} ) INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) |