[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/dolphin/src
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-03-16 12:30:47
Message-ID: 1268742647.088803.694.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1103978 by lunakl:

welcome to the world of kdeinit applications



 M  +4 -3      CMakeLists.txt  
 M  +2 -1      main.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/CMakeLists.txt #1103977:1103978
@@ -203,9 +203,9 @@
 
 kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
 
-kde4_add_executable(dolphin ${dolphin_SRCS})
+kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin
+target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
     ${KDE4_KUTILS_LIBRARY}
@@ -216,13 +216,14 @@
 )
 
 if (Nepomuk_FOUND)
-    target_link_libraries(dolphin
+    target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
     )
 endif (Nepomuk_FOUND)
 
+install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
--- trunk/KDE/kdebase/apps/dolphin/src/main.cpp #1103977:1103978
@@ -28,7 +28,8 @@
 #include <kmainwindow.h>
 #include <kdebug.h>
 
-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
[prev in list] [next in list] [prev in thread] [next in thread]