From: Luboš Luňák Date: Tue, 16 Mar 2010 12:30:46 +0000 (+0000) Subject: welcome to the world of kdeinit applications X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4bb1ba92179c72a761bebb978635f2fcf8b4c118?ds=inline welcome to the world of kdeinit applications svn path=/trunk/KDE/kdebase/apps/; revision=1103978 --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8e9c89c0..f6d63fc11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -203,9 +203,9 @@ qt4_add_dbus_adaptor(dolphin_SRCS 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 @@ target_link_libraries(dolphin ) 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}) ########################################## diff --git a/src/main.cpp b/src/main.cpp index 3418c333f..290ca18ab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,8 @@ #include #include -int main(int argc, char **argv) +extern "C" +KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("dolphin", 0, ki18nc("@title", "Dolphin"),