Patch by Luca Gugelmann: get rid of any mainwindow dependency from the sidebars.

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4942495702ae9ea243c8088130bd57dce01e4a4..2ad4814e20eb7ec2c73463fa4d0d6717494adbeb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,62 +2,99 @@
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )

 
 ########### next target ###############
 
 
 ########### next target ###############
 

+set(dolphinprivate_LIB_SRCS
+       dolphincontroller.cpp
+       dolphindetailsview.cpp
+       dolphiniconsview.cpp
+       dolphinsettings.cpp
+       viewproperties.cpp
+       dolphinsortfilterproxymodel.cpp
+       )
+
+kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
+   dolphin_directoryviewpropertysettings.kcfgc
+   dolphin_detailsmodesettings.kcfgc
+   dolphin_iconsmodesettings.kcfgc
+   dolphin_generalsettings.kcfgc)
+
+
+kde4_automoc(${dolphinprivate_LIB_SRCS})
+
+kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
+
+target_link_libraries(dolphinprivate ${KDE4_KDEUI_LIBS} konq)
+
+set_target_properties(dolphinprivate PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+install(TARGETS dolphinprivate  DESTINATION ${LIB_INSTALL_DIR} )
+
+
+##########################################
+

 set(dolphin_SRCS
 set(dolphin_SRCS

-   main.cpp
+   applyviewpropsjob.cpp
+   bookmarkselector.cpp
+   bookmarkssettingspage.cpp
+   bookmarkssidebarpage.cpp
+   detailsviewsettingspage.cpp

    dolphinapplication.cpp
    dolphinmainwindow.cpp
    dolphinapplication.cpp
    dolphinmainwindow.cpp

+   dolphinnewmenu.cpp

    dolphinview.cpp
    dolphinview.cpp

-   urlnavigator.cpp
-   urlnavigatorbutton.cpp
-   viewpropertiesdialog.cpp

    dolphinstatusbar.cpp
    dolphindirlister.cpp
    dolphinstatusbar.cpp
    dolphindirlister.cpp

-   viewproperties.cpp
-   dolphindetailsview.cpp
-   dolphiniconsview.cpp
-   dolphinsettings.cpp
-   bookmarkselector.cpp
-   urlbutton.cpp

    dolphincontextmenu.cpp
    dolphincontextmenu.cpp

-   undomanager.cpp
-   progressindicator.cpp
-   iconsviewsettingspage.cpp
-   pixmapviewer.cpp

    dolphinsettingsdialog.cpp
    dolphinsettingsdialog.cpp

-   viewsettingspage.cpp
-   detailsviewsettingspage.cpp
-   statusbarmessagelabel.cpp
-   generalsettingspage.cpp
-   bookmarkssettingspage.cpp

    editbookmarkdialog.cpp
    editbookmarkdialog.cpp

+   filterbar.cpp
+   generalsettingspage.cpp
+   generalviewsettingspage.cpp
+   iconsizedialog.cpp
+   iconsviewsettingspage.cpp
+   infosidebarpage.cpp
+   main.cpp
+   metadatawidget.cpp
+   protocolcombo.cpp
+   pixmapviewer.cpp
+   renamedialog.cpp

    settingspagebase.cpp
    sidebarpage.cpp
    settingspagebase.cpp
    sidebarpage.cpp

-   bookmarkssidebarpage.cpp
-   infosidebarpage.cpp

    statusbarspaceinfo.cpp
    statusbarspaceinfo.cpp

-   renamedialog.cpp
-   filterbar.cpp
-   protocolcombo.cpp
-   viewpropsprogressinfo.cpp
-   applyviewpropsjob.cpp )
+   statusbarmessagelabel.cpp
+   treeviewcontextmenu.cpp
+   treeviewsidebarpage.cpp
+   sidebartreeview.cpp
+   urlbutton.cpp
+   urlnavigator.cpp
+   urlnavigatorbutton.cpp
+   viewpropertiesdialog.cpp
+   viewsettingspage.cpp
+   viewpropsprogressinfo.cpp )

 
 kde4_automoc(${dolphin_SRCS})
 
 
 kde4_automoc(${dolphin_SRCS})
 

-kde4_add_kcfg_files(dolphin_SRCS
-   directoryviewpropertysettings.kcfgc
-   generalsettings.kcfgc
-   iconsmodesettings.kcfgc
-   detailsmodesettings.kcfgc
-   previewsmodesettings.kcfgc )
-
+qt4_add_dbus_adaptor(dolphin_SRCS
+   org.kde.dolphin.Application.xml
+   dolphinapplication.h DolphinApplication)
+qt4_add_dbus_adaptor(dolphin_SRCS
+   org.kde.dolphin.MainWindow.xml
+   dolphinmainwindow.h DolphinMainWindow)

 kde4_add_executable(dolphin ${dolphin_SRCS})
 kde4_add_executable(dolphin ${dolphin_SRCS})

-
-target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} )
+# find Nepomuk's libkmetadata
+find_path(KMETADATA_INCLUDE_DIR NAMES kmetadata/kmetadata.h PATHS ${KDE4_INCLUDE_DIR})
+find_library(KMETADATA_LIBRARY NAMES kmetadata kmetadatatools PATHS ${KDE4_LIB_DIR})
+find_library(KMETADATA_TOOLS_LIBRARY NAMES kmetadatatools PATHS ${KDE4_LIB_DIR})
+if(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY AND KMETADATA_TOOLS_LIBRARY)
+set(KDE4_KMETADATA kmetadata kmetadatatools)
+set(HAVE_KMETADATA 1)
+else(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY)
+set(KDE4_KMETADATA "")
+endif(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY AND KMETADATA_TOOLS_LIBRARY)
+configure_file(config-kmetadata.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmetadata.h )
+target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KMETADATA} konq dolphinprivate)

 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 
 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 


@@ -65,7 +102,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )

-install( FILES  directoryviewpropertysettings.kcfg generalsettings.kcfg                                iconsmodesettings.kcfg detailsmodesettings.kcfg previewsmodesettings.kcfg                               DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )