diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-05 10:40:13 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-05 10:40:13 +0100 |
| commit | f2a846d56cea2f33e85e52f9c99a3c73c2195feb (patch) | |
| tree | c285492a0c552f7d52320aad368868f21e6dc189 /src/CMakeLists.txt | |
| parent | Merge commit 'refs/merge-requests/1986' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | Trivial MainView Test (diff) | |
| download | rekonq-f2a846d56cea2f33e85e52f9c99a3c73c2195feb.tar.xz | |
Merge branch 'AutoTests'
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 279d9519..5bd41b25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,11 @@ +### ------- tests sub dir ------- + +ADD_SUBDIRECTORY( tests ) + + ### ------- SETTING REKONQ FILES.. -SET( rekonq_SRCS +SET( rekonq_KDEINIT_SRCS homepage.cpp previewimage.cpp websnap.cpp @@ -18,8 +23,7 @@ SET( rekonq_SRCS urlbar.cpp findbar.cpp settings.cpp - webview.cpp - main.cpp + webview.cpp sidepanel.cpp panelhistory.cpp lineedit.cpp @@ -29,7 +33,7 @@ SET( rekonq_SRCS ) -KDE4_ADD_UI_FILES( rekonq_SRCS +KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS settings_general.ui settings_tabs.ui settings_fonts.ui @@ -37,7 +41,7 @@ KDE4_ADD_UI_FILES( rekonq_SRCS cleardata.ui ) -KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc ) +KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc ) ### ------------- INCLUDING DIRECTORIES... @@ -55,12 +59,12 @@ ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} ) ### --------------- ADDING EXECUTABLE... -KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) +KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp ) ### --------------- TARGETTING LINK LIBRARIES... -TARGET_LINK_LIBRARIES ( rekonq +TARGET_LINK_LIBRARIES ( kdeinit_rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} ${QT_QTWEBKIT_LIBRARY} @@ -74,4 +78,5 @@ TARGET_LINK_LIBRARIES ( rekonq ### ------------ INSTALL FILES... INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) +INSTALL( TARGETS kdeinit_rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) INSTALL( FILES rekonq.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) |