diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index 0b2cb02a..291e3917 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories(${KDE4_KPARTS_INCLUDES}) include(CheckFunctionExists) include(CheckIncludeFiles) include(CheckVariableExists) + check_variable_exists(__progname HAVE___PROGNAME) check_variable_exists(__progname_full HAVE___PROGNAME_FULL) check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H) @@ -19,17 +20,19 @@ check_include_files(unistd.h HAVE_UNISTD_H) check_function_exists(pstat HAVE_PSTAT) check_function_exists(setproctitle HAVE_SETPROCTITLE) - # used by 4 executables in this file set(KINIT_SOCKET_LIBRARY) if(HAVE_SOCKET_LIBRARY) set(KINIT_SOCKET_LIBRARY socket) endif() - ########### kdeinit4 ############### -set(kdeinit_SRCS kinit.cpp proctitle.cpp klauncher_cmds.cpp) +set(kdeinit_SRCS + kinit.cpp + proctitle.cpp + klauncher_cmds.cpp +) add_executable(kdeinit4 ${kdeinit_SRCS}) @@ -42,9 +45,7 @@ install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### kwrapper4 ############### -set(kwrapper_SRCS kwrapper.c) - -add_executable(kwrapper4 ${kwrapper_SRCS}) +add_executable(kwrapper4 kwrapper.c) target_link_libraries(kwrapper4 ${KINIT_SOCKET_LIBRARY}) @@ -73,9 +74,7 @@ install(TARGETS kshell4 ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### lnusertemp ############### -set(lnusertemp_SRCS lnusertemp.c) - -add_executable(lnusertemp ${lnusertemp_SRCS}) +add_executable(lnusertemp lnusertemp.c) target_link_libraries(lnusertemp kdefakes) @@ -84,9 +83,7 @@ install(TARGETS lnusertemp DESTINATION ${LIBEXEC_INSTALL_DIR}) ########### kioslave ############### -set(kioslave_SRCS kioslave.cpp) - -add_executable(kioslave ${kioslave_SRCS}) +add_executable(kioslave kioslave.cpp) target_link_libraries(kioslave ${KDE4_KIO_LIBS}) @@ -118,7 +115,8 @@ install(TARGETS klauncher DESTINATION ${LIBEXEC_INSTALL_DIR}) ########### install files ############### install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml + FILES + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kinit/tests/CMakeLists.txt b/kinit/tests/CMakeLists.txt index a9b62a21..d151b7f3 100644 --- a/kinit/tests/CMakeLists.txt +++ b/kinit/tests/CMakeLists.txt @@ -1,7 +1,5 @@ -include_directories( ${KDE4_KIO_INCLUDES} ) +include_directories(${KDE4_KIO_INCLUDES}) -set(klaunchertest_SRCS klaunchertest.cpp ) +kde4_add_manual_test(klaunchertest klaunchertest.cpp) -kde4_add_manual_test(klaunchertest ${klaunchertest_SRCS}) - -target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} kio ) +target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} kio) diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 8927165b..a1fbe63e 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -1,151 +1,173 @@ project(kio) if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) - set(KIO_NO_SOLID TRUE) -endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) + set(KIO_NO_SOLID TRUE) +endif() if(NOT STRIGI_FOUND) - set(KIO_NO_STRIGI TRUE) -endif(NOT STRIGI_FOUND) + set(KIO_NO_STRIGI TRUE) +endif() if(OPENSSL_FOUND) - set(KSSL_HAVE_SSL 1) - include_directories(${OPENSSL_INCLUDE_DIR}) -endif(OPENSSL_FOUND) + set(KSSL_HAVE_SSL 1) + include_directories(${OPENSSL_INCLUDE_DIR}) +endif() # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks - ${CMAKE_CURRENT_SOURCE_DIR}/kio - ${CMAKE_CURRENT_SOURCE_DIR}/kfile - ${CMAKE_CURRENT_SOURCE_DIR}/kssl - ${CMAKE_CURRENT_SOURCE_DIR} # for including kio/kio_export.h - ${CMAKE_CURRENT_BINARY_DIR}/kio - ${CMAKE_CURRENT_BINARY_DIR}/kssl - ${CMAKE_CURRENT_BINARY_DIR} # e.g. for observer_stub.h - ${KDE4_KDEUI_INCLUDES} - ${KDE4_KDECORE_INCLUDES}/ - ${ZLIB_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks + ${CMAKE_CURRENT_SOURCE_DIR}/kio + ${CMAKE_CURRENT_SOURCE_DIR}/kfile + ${CMAKE_CURRENT_SOURCE_DIR}/kssl + # for including kio/kio_export.h + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/kio + ${CMAKE_CURRENT_BINARY_DIR}/kssl + # e.g. for observer_stub.h + ${CMAKE_CURRENT_BINARY_DIR} + ${KDE4_KDEUI_INCLUDES} + ${KDE4_KDECORE_INCLUDES} + ${ZLIB_INCLUDE_DIR} +) - ) -if (NOT KIO_NO_STRIGI) - include_directories(${STRIGI_INCLUDE_DIR}) - set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY}) +if(NOT KIO_NO_STRIGI) + include_directories(${STRIGI_INCLUDE_DIR}) + set(KIO_EXTRA_LIBS + ${KIO_EXTRA_LIBS} + ${STRIGI_STREAMANALYZER_LIBRARY} + ${STRIGI_STREAMS_LIBRARY} + ) endif() if(NOT KIO_NO_SOLID) - include_directories(${CMAKE_BINARY_DIR}/solid/) - include_directories(${CMAKE_SOURCE_DIR}/solid/) - set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) -endif(NOT KIO_NO_SOLID) + include_directories(${CMAKE_BINARY_DIR}/solid/) + include_directories(${CMAKE_SOURCE_DIR}/solid/) + set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) +endif() -configure_file(kio/config-kio.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kio.h ) +configure_file( + kio/config-kio.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/kio/config-kio.h +) -configure_file(kssl/ksslconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h ) -#macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h ) +configure_file( + kssl/ksslconfig.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h +) +# macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h ) -add_subdirectory( kssl/kcm ) -add_subdirectory( misc ) +add_subdirectory(kssl/kcm) +add_subdirectory(misc) if(ENABLE_TESTING) - add_subdirectory( tests ) + add_subdirectory(tests) endif() if(STRIGI_FOUND) - add_subdirectory( kio/dummyanalyzers ) + add_subdirectory(kio/dummyanalyzers) endif(STRIGI_FOUND) set(kiocore_STAT_SRCS - kio/accessmanager.cpp - kio/accessmanagerreply_p.cpp - kio/authinfo.cpp - kio/chmodjob.cpp - kio/connection.cpp - kio/copyjob.cpp - kio/dataprotocol.cpp - kio/dataslave.cpp - kio/davjob.cpp - kio/defaultviewadapter.cpp - kio/delegateanimationhandler.cpp - kio/deletejob.cpp - kio/directorysizejob.cpp - kio/filejob.cpp - kio/fileundomanager.cpp - kio/forwardingslavebase.cpp - kio/global.cpp - kio/imagefilter.cpp - kio/job.cpp - kio/jobuidelegate.cpp - kio/joburlcache.cpp - kio/kabstractfileitemactionplugin.cpp - kio/kacl.cpp - kio/kbuildsycocaprogressdialog.cpp - kio/kdatatool.cpp - kio/kdbusservicestarter.cpp - kio/kdesktopfileactions.cpp - kio/kdirlister.cpp - kio/kdirmodel.cpp - kio/kdirnotify.cpp - kio/kdynamicjobtracker.cpp - kio/kemailsettings.cpp - kio/kfileitem.cpp - kio/kfileitemlistproperties.cpp - kio/kfileitemactions.cpp - kio/kfileitemdelegate.cpp - kio/kfilemetainfo.cpp - kio/kfilemetainfoitem.cpp - kio/kfileshare.cpp - kio/kfilewriteplugin.cpp - kio/kimageio.cpp - kio/kmimetypechooser.cpp - kio/kprotocolmanager.cpp - kio/kremoteencoding.cpp - kio/krun.cpp - kio/kscan.cpp - kio/kshellcompletion.cpp - kio/kurifilter.cpp - kio/kurlcompletion.cpp - kio/kurlpixmapprovider.cpp - kio/metainfojob.cpp - kio/netaccess.cpp - kio/paste.cpp - kio/pastedialog.cpp - kio/predicateproperties.cpp - kio/previewjob.cpp - kio/renamedialog.cpp - kio/renamedialogplugin.cpp - kio/scheduler.cpp - kio/sessiondata.cpp - kio/skipdialog.cpp - kio/slave.cpp - kio/slavebase.cpp - kio/slaveconfig.cpp - kio/slaveinterface.cpp - kio/tcpslavebase.cpp - kio/thumbcreator.cpp - kio/thumbsequencecreator.cpp - kio/udsentry.cpp - kio/hostinfo.cpp - kio/kpasswdserver.cpp - kio/kpasswdserverloop.cpp - kio/usernotificationhandler.cpp - kio/clipboardupdater.cpp + kio/accessmanager.cpp + kio/accessmanagerreply_p.cpp + kio/authinfo.cpp + kio/chmodjob.cpp + kio/connection.cpp + kio/copyjob.cpp + kio/dataprotocol.cpp + kio/dataslave.cpp + kio/davjob.cpp + kio/defaultviewadapter.cpp + kio/delegateanimationhandler.cpp + kio/deletejob.cpp + kio/directorysizejob.cpp + kio/filejob.cpp + kio/fileundomanager.cpp + kio/forwardingslavebase.cpp + kio/global.cpp + kio/imagefilter.cpp + kio/job.cpp + kio/jobuidelegate.cpp + kio/joburlcache.cpp + kio/kabstractfileitemactionplugin.cpp + kio/kacl.cpp + kio/kbuildsycocaprogressdialog.cpp + kio/kdatatool.cpp + kio/kdbusservicestarter.cpp + kio/kdesktopfileactions.cpp + kio/kdirlister.cpp + kio/kdirmodel.cpp + kio/kdirnotify.cpp + kio/kdynamicjobtracker.cpp + kio/kemailsettings.cpp + kio/kfileitem.cpp + kio/kfileitemlistproperties.cpp + kio/kfileitemactions.cpp + kio/kfileitemdelegate.cpp + kio/kfilemetainfo.cpp + kio/kfilemetainfoitem.cpp + kio/kfileshare.cpp + kio/kfilewriteplugin.cpp + kio/kimageio.cpp + kio/kmimetypechooser.cpp + kio/kprotocolmanager.cpp + kio/kremoteencoding.cpp + kio/krun.cpp + kio/kscan.cpp + kio/kshellcompletion.cpp + kio/kurifilter.cpp + kio/kurlcompletion.cpp + kio/kurlpixmapprovider.cpp + kio/metainfojob.cpp + kio/netaccess.cpp + kio/paste.cpp + kio/pastedialog.cpp + kio/predicateproperties.cpp + kio/previewjob.cpp + kio/renamedialog.cpp + kio/renamedialogplugin.cpp + kio/scheduler.cpp + kio/sessiondata.cpp + kio/skipdialog.cpp + kio/slave.cpp + kio/slavebase.cpp + kio/slaveconfig.cpp + kio/slaveinterface.cpp + kio/tcpslavebase.cpp + kio/thumbcreator.cpp + kio/thumbsequencecreator.cpp + kio/udsentry.cpp + kio/hostinfo.cpp + kio/kpasswdserver.cpp + kio/kpasswdserverloop.cpp + kio/usernotificationhandler.cpp + kio/clipboardupdater.cpp ) if(NOT KIO_NO_SOLID) - set(kiocore_STAT_SRCS - ${kiocore_STAT_SRCS} - kio/kstatusbarofflineindicator.cpp + set(kiocore_STAT_SRCS + ${kiocore_STAT_SRCS} + kio/kstatusbarofflineindicator.cpp ) -endif(NOT KIO_NO_SOLID) +endif() -qt4_add_dbus_adaptor(kiocore_STAT_SRCS kio/org.kde.kio.FileUndoManager.xml fileundomanager_p.h KIO::FileUndoManagerPrivate fileundomanager_adaptor KIOFileUndoManagerAdaptor) +qt4_add_dbus_adaptor(kiocore_STAT_SRCS + kio/org.kde.kio.FileUndoManager.xml + fileundomanager_p.h KIO::FileUndoManagerPrivate + fileundomanager_adaptor + KIOFileUndoManagerAdaptor +) -qt4_add_dbus_interface(kiocore_STAT_SRCS kio/org.kde.kuiserver.xml kuiserver_interface) +qt4_add_dbus_interface(kiocore_STAT_SRCS + kio/org.kde.kuiserver.xml + kuiserver_interface +) set_source_files_properties(kio/org.kde.KPasswdServer.xml PROPERTIES INCLUDE kio/authinfo.h ) -qt4_add_dbus_interface(kiocore_STAT_SRCS kio/org.kde.KPasswdServer.xml kpasswdserver_interface) -install(FILES kio/org.kde.KPasswdServer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) +qt4_add_dbus_interface(kiocore_STAT_SRCS + kio/org.kde.KPasswdServer.xml + kpasswdserver_interface +) if(UNIX) set(kiocore_STAT_SRCS ${kiocore_STAT_SRCS} @@ -157,98 +179,79 @@ if(UNIX) endif(UNIX) set(kbookmarks_STAT_SRCS - bookmarks/kbookmark.cc - bookmarks/kbookmarkimporter.cc - bookmarks/kbookmarkmanager.cc - bookmarks/kbookmarkmanageradaptor.cc - bookmarks/kbookmarkmenu.cc - bookmarks/konqbookmarkmenu.cc - bookmarks/kbookmarkimporter_opera.cc - bookmarks/kbookmarkimporter_ie.cc - bookmarks/kbookmarkimporter_ns.cc - bookmarks/kbookmarkdombuilder.cc - bookmarks/kbookmarkdialog.cc + bookmarks/kbookmark.cc + bookmarks/kbookmarkimporter.cc + bookmarks/kbookmarkmanager.cc + bookmarks/kbookmarkmanageradaptor.cc + bookmarks/kbookmarkmenu.cc + bookmarks/konqbookmarkmenu.cc + bookmarks/kbookmarkimporter_opera.cc + bookmarks/kbookmarkimporter_ie.cc + bookmarks/kbookmarkimporter_ns.cc + bookmarks/kbookmarkdombuilder.cc + bookmarks/kbookmarkdialog.cc ) set(kfile_STAT_SRCS - kfile/kabstractfilemodule.cpp - kfile/kacleditwidget.cpp - kfile/kdiskfreespaceinfo.cpp - kfile/kencodingfiledialog.cpp - kfile/kfile.cpp - kfile/kfiledialog.cpp - kfile/kfilemetadataconfigurationwidget.cpp - kfile/kfilemetadatawidget.cpp - kfile/kfilemetainfowidget.cpp - kfile/kfilemetapreview.cpp - kfile/kicondialog.cpp - kfile/kimagefilepreview.cpp - kfile/kmetaprops.cpp - kfile/knfotranslator.cpp - kfile/kopenwithdialog.cpp - kfile/kpreviewprops.cpp - kfile/kpreviewwidgetbase.cpp - kfile/kpropertiesdialog.cpp - kfile/krecentdirs.cpp - kfile/krecentdocument.cpp - kfile/kurlcombobox.cpp - kfile/kurlrequester.cpp - kfile/kurlrequesterdialog.cpp - kfile/kfilemetadatareader.cpp - kfile/kfilemetadataprovider.cpp -) - -if(NOT KIO_NO_SOLID) - set(kfile_STAT_SRCS - ${kfile_STAT_SRCS} - kfile/kdiskfreespace.cpp - kfile/kdevicelistitem.cpp - kfile/kdevicelistmodel.cpp - ) -endif(NOT KIO_NO_SOLID) - -set(kfile_STAT_SRCS - ${kfile_STAT_SRCS} + kfile/kabstractfilemodule.cpp + kfile/kacleditwidget.cpp + kfile/kdiskfreespaceinfo.cpp + kfile/kencodingfiledialog.cpp + kfile/kfile.cpp + kfile/kfiledialog.cpp + kfile/kfilemetadataconfigurationwidget.cpp + kfile/kfilemetadatawidget.cpp + kfile/kfilemetainfowidget.cpp + kfile/kfilemetapreview.cpp + kfile/kicondialog.cpp + kfile/kimagefilepreview.cpp + kfile/kmetaprops.cpp + kfile/knfotranslator.cpp + kfile/kopenwithdialog.cpp + kfile/kpreviewprops.cpp + kfile/kpreviewwidgetbase.cpp + kfile/kpropertiesdialog.cpp + kfile/krecentdirs.cpp + kfile/krecentdocument.cpp + kfile/kurlcombobox.cpp + kfile/kurlrequester.cpp + kfile/kurlrequesterdialog.cpp + kfile/kfilemetadatareader.cpp + kfile/kfilemetadataprovider.cpp kfile/kfilesharedialog.cpp kfile/kfsprocess.cpp ) +if(NOT KIO_NO_SOLID) + set(kfile_STAT_SRCS + ${kfile_STAT_SRCS} + kfile/kdiskfreespace.cpp + kfile/kdevicelistitem.cpp + kfile/kdevicelistmodel.cpp + ) +endif() + qt4_add_resources(kfile_STAT_SRCS kfile/kacleditwidget.qrc) set(kssl_STAT_SRCS - kssl/sslui.cpp - kssl/ksslcertificatebox.cpp - kssl/ksslinfodialog.cpp -# below is what's left of KDE2/3 SSL code, still required for certificate chain validation -# by hand and for key generation. Network code has been removed. - kssl/kopenssl.cpp - kssl/kssl.cpp - kssl/ksslcertchain.cpp - kssl/ksslcertificate.cpp - kssl/ksslkeygen.cpp - kssl/ksslsettings.cpp - kssl/ksslutils.cpp - kssl/ksslx509v3.cpp + kssl/sslui.cpp + kssl/ksslcertificatebox.cpp + kssl/ksslinfodialog.cpp + # below is what's left of KDE2/3 SSL code, still required for certificate chain validation + # by hand and for key generation. Network code has been removed. + kssl/kopenssl.cpp + kssl/kssl.cpp + kssl/ksslcertchain.cpp + kssl/ksslcertificate.cpp + kssl/ksslkeygen.cpp + kssl/ksslsettings.cpp + kssl/ksslutils.cpp + kssl/ksslx509v3.cpp ) ########### next target ############### - - -set(kio_LIB_SRCS - ${kiocore_STAT_SRCS} - ${kbookmarks_STAT_SRCS} - ${kfile_STAT_SRCS} - ${kssl_STAT_SRCS} - kfile/kpropertiesdesktopadvbase.ui - kfile/kpropertiesdesktopbase.ui - kssl/keygenwizard.ui - kssl/keygenwizard2.ui - kssl/sslinfo.ui - kssl/certificateparty.ui -) - set(kio_LIB_PRIVATE_SRCS kio/kfileshare_p.h kio/krun_p.h @@ -264,163 +267,216 @@ add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS}) add_executable(kfilemetadatareader ${kfilemetadatareaderprocess_SRCS}) target_link_libraries(kfilemetadatareader ${KDE4_KIO_LIBS}) -target_link_libraries(kio PRIVATE ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS}) -target_link_libraries(kio PUBLIC kdeui kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ) +target_link_libraries(kio PRIVATE + ${KDE4_KDEUI_LIBS} + ${ZLIB_LIBRARY} + ${QT_QTSVG_LIBRARY} + ${X11_LIBRARIES} + ${KIO_EXTRA_LIBS} +) +target_link_libraries(kio PUBLIC + kdeui + kdecore + ${QT_QTNETWORK_LIBRARY} + ${QT_QTXML_LIBRARY} + ${QT_QTGUI_LIBRARY} +) if(ACL_FOUND) - target_link_libraries(kio PRIVATE ${ACL_LIBS}) -endif(ACL_FOUND) + target_link_libraries(kio PRIVATE ${ACL_LIBS}) +endif() if(X11_Xrender_FOUND) target_link_libraries(kio PRIVATE ${X11_Xrender_LIB}) -endif(X11_Xrender_FOUND) +endif() set_target_properties(kio PROPERTIES VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION}) + SOVERSION ${GENERIC_LIB_SOVERSION} +) ########### install files ############### -install(TARGETS kio EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(TARGETS kfilemetadatareader ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( FILES data.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES - application.desktop - kcmodule.desktop - kcmoduleinit.desktop - kdatatool.desktop - kfileplugin.desktop - kscan.desktop - kurifilterplugin.desktop - renamedialogplugin.desktop - kfile/kpropertiesdialogplugin.desktop - kio/kfilewrite.desktop - kio/kfileitemactionplugin.desktop - kfile/kiofilemodule.desktop -DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( + TARGETS kio + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) -install( FILES - kio/kio_export.h - kio/accessmanager.h - kio/connection.h - kio/slaveinterface.h - kio/slave.h - kio/slaveconfig.h - kio/sessiondata.h - kio/global.h - kio/netaccess.h - kio/job.h - kio/scheduler.h - kio/jobclasses.h - kio/copyjob.h - kio/deletejob.h - kio/jobuidelegate.h - kio/paste.h - kio/slavebase.h - kio/filejob.h - kio/fileundomanager.h - kio/tcpslavebase.h - kio/forwardingslavebase.h - kio/chmodjob.h - kio/authinfo.h - kio/ioslave_defaults.h - kio/http_slave_defaults.h - kio/previewjob.h - kio/thumbcreator.h - kio/thumbsequencecreator.h - kio/metainfojob.h - kio/davjob.h - kio/directorysizejob.h - kio/renamedialog.h - kio/renamedialogplugin.h - kio/skipdialog.h - kio/udsentry.h - kssl/sslui.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel) +install( + TARGETS kfilemetadatareader + ${INSTALL_TARGETS_DEFAULT_ARGS} +) -install( FILES kfile/kfilesharedialog.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install( + FILES + data.protocol + DESTINATION ${SERVICES_INSTALL_DIR} +) -install( FILES - kio/kabstractfileitemactionplugin.h - kio/kacl.h - kio/kautomount.h - kio/kbuildsycocaprogressdialog.h - kio/kdatatool.h - kio/kdbusservicestarter.h - kio/kdesktopfileactions.h - kio/kdirlister.h - kio/kdirmodel.h - kio/kdirnotify.h - kio/kemailsettings.h - kio/kfileitem.h - kio/kfileitemlistproperties.h - kio/kfileitemactions.h - kio/kfileitemdelegate.h - kio/kfilemetainfo.h - kio/kfilemetainfoitem.h - kio/kfileshare.h - kio/kfilewriteplugin.h - kio/kimageio.h - kio/kmimetypechooser.h - kio/knfsshare.h - kio/kprotocolmanager.h - kio/kremoteencoding.h - kio/krun.h - kio/ksambashare.h - kio/ksambasharedata.h - kio/kscan.h - kio/kshellcompletion.h - kio/kurifilter.h - kio/kurlcompletion.h - kio/kurlpixmapprovider.h - kio/predicateproperties.h - kfile/kabstractfilemodule.h - kfile/kabstractfilewidget.h - kfile/kdiskfreespaceinfo.h - kfile/kencodingfiledialog.h - kfile/kfile.h - kfile/kfiledialog.h - kfile/kicondialog.h - kfile/kimagefilepreview.h - kfile/kfilemetadataconfigurationwidget.h - kfile/kfilemetadatawidget.h - kfile/kopenwithdialog.h - kfile/kpreviewwidgetbase.h - kfile/kpropertiesdialog.h - kfile/kpropsdialog.h - kfile/krecentdirs.h - kfile/krecentdocument.h - kfile/kurlcombobox.h - kfile/kurlrequester.h - kfile/kurlrequesterdialog.h - bookmarks/kbookmark.h - bookmarks/kbookmarkexporter.h - bookmarks/kbookmarkimporter.h - bookmarks/kbookmarkmanager.h - bookmarks/kbookmarkmenu.h - bookmarks/kbookmarkimporter_opera.h - bookmarks/kbookmarkimporter_ie.h - bookmarks/kbookmarkimporter_ns.h - bookmarks/kbookmarkdombuilder.h - bookmarks/konqbookmarkmenu.h - bookmarks/kbookmarkdialog.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install( + FILES + application.desktop + kcmodule.desktop + kcmoduleinit.desktop + kdatatool.desktop + kfileplugin.desktop + kscan.desktop + kurifilterplugin.desktop + renamedialogplugin.desktop + kfile/kpropertiesdialogplugin.desktop + kio/kfilewrite.desktop + kio/kfileitemactionplugin.desktop + kfile/kiofilemodule.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + +install( + FILES + kio/kio_export.h + kio/accessmanager.h + kio/connection.h + kio/slaveinterface.h + kio/slave.h + kio/slaveconfig.h + kio/sessiondata.h + kio/global.h + kio/netaccess.h + kio/job.h + kio/scheduler.h + kio/jobclasses.h + kio/copyjob.h + kio/deletejob.h + kio/jobuidelegate.h + kio/paste.h + kio/slavebase.h + kio/filejob.h + kio/fileundomanager.h + kio/tcpslavebase.h + kio/forwardingslavebase.h + kio/chmodjob.h + kio/authinfo.h + kio/ioslave_defaults.h + kio/http_slave_defaults.h + kio/previewjob.h + kio/thumbcreator.h + kio/thumbsequencecreator.h + kio/metainfojob.h + kio/davjob.h + kio/directorysizejob.h + kio/renamedialog.h + kio/renamedialogplugin.h + kio/skipdialog.h + kio/udsentry.h + kssl/sslui.h + DESTINATION ${INCLUDE_INSTALL_DIR}/kio + COMPONENT Devel +) + +install( + FILES + kfile/kfilesharedialog.h + DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Devel +) + +install( + FILES + kio/kabstractfileitemactionplugin.h + kio/kacl.h + kio/kautomount.h + kio/kbuildsycocaprogressdialog.h + kio/kdatatool.h + kio/kdbusservicestarter.h + kio/kdesktopfileactions.h + kio/kdirlister.h + kio/kdirmodel.h + kio/kdirnotify.h + kio/kemailsettings.h + kio/kfileitem.h + kio/kfileitemlistproperties.h + kio/kfileitemactions.h + kio/kfileitemdelegate.h + kio/kfilemetainfo.h + kio/kfilemetainfoitem.h + kio/kfileshare.h + kio/kfilewriteplugin.h + kio/kimageio.h + kio/kmimetypechooser.h + kio/knfsshare.h + kio/kprotocolmanager.h + kio/kremoteencoding.h + kio/krun.h + kio/ksambashare.h + kio/ksambasharedata.h + kio/kscan.h + kio/kshellcompletion.h + kio/kurifilter.h + kio/kurlcompletion.h + kio/kurlpixmapprovider.h + kio/predicateproperties.h + kfile/kabstractfilemodule.h + kfile/kabstractfilewidget.h + kfile/kdiskfreespaceinfo.h + kfile/kencodingfiledialog.h + kfile/kfile.h + kfile/kfiledialog.h + kfile/kicondialog.h + kfile/kimagefilepreview.h + kfile/kfilemetadataconfigurationwidget.h + kfile/kfilemetadatawidget.h + kfile/kopenwithdialog.h + kfile/kpreviewwidgetbase.h + kfile/kpropertiesdialog.h + kfile/kpropsdialog.h + kfile/krecentdirs.h + kfile/krecentdocument.h + kfile/kurlcombobox.h + kfile/kurlrequester.h + kfile/kurlrequesterdialog.h + bookmarks/kbookmark.h + bookmarks/kbookmarkexporter.h + bookmarks/kbookmarkimporter.h + bookmarks/kbookmarkmanager.h + bookmarks/kbookmarkmenu.h + bookmarks/kbookmarkimporter_opera.h + bookmarks/kbookmarkimporter_ie.h + bookmarks/kbookmarkimporter_ns.h + bookmarks/kbookmarkdombuilder.h + bookmarks/konqbookmarkmenu.h + bookmarks/kbookmarkdialog.h + DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Devel +) if(NOT KIO_NO_SOLID) -install( FILES - kfile/kdevicelistmodel.h - kio/kstatusbarofflineindicator.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) -endif(NOT KIO_NO_SOLID) + install( + FILES + kfile/kdevicelistmodel.h + kio/kstatusbarofflineindicator.h + DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Devel + ) +endif() -install(FILES - kio/org.kde.KDirNotify.xml - kio/org.kde.kio.FileUndoManager.xml - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) +install( + FILES + kio/org.kde.KDirNotify.xml + kio/org.kde.kio.FileUndoManager.xml + kio/org.kde.KPasswdServer.xml + DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} +) -install(FILES kio/accept-languages.codes DESTINATION ${CONFIG_INSTALL_DIR}) +install( + FILES + kio/accept-languages.codes + DESTINATION ${CONFIG_INSTALL_DIR} +) -install(FILES kssl/ca-bundle.crt DESTINATION ${DATA_INSTALL_DIR}/kssl ) +install( + FILES + kssl/ca-bundle.crt DESTINATION + ${DATA_INSTALL_DIR}/kssl +) diff --git a/kio/kssl/kcm/CMakeLists.txt b/kio/kssl/kcm/CMakeLists.txt index a5f8bce2..a8d4fd7b 100644 --- a/kio/kssl/kcm/CMakeLists.txt +++ b/kio/kssl/kcm/CMakeLists.txt @@ -4,13 +4,17 @@ set(kcmssl_SRCS kcmssl.cpp cacertificatespage.cpp displaycertdialog.cpp - cacertificates.ui - displaycert.ui ) kde4_add_plugin(kcm_ssl ${kcmssl_SRCS}) target_link_libraries(kcm_ssl ${KDE4_KIO_LIBS}) -install(TARGETS kcm_ssl DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### -install(FILES kcm_ssl.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + +install(TARGETS kcm_ssl DESTINATION ${PLUGIN_INSTALL_DIR}) + +install( + FILES + kcm_ssl.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt index c56fd033..51e3208b 100644 --- a/kio/misc/CMakeLists.txt +++ b/kio/misc/CMakeLists.txt @@ -1,39 +1,59 @@ # for strange kio/foo.h includes -include_directories( BEFORE ${CMAKE_SOURCE_DIR}/kio ) +include_directories(BEFORE ${CMAKE_SOURCE_DIR}/kio) # arpa/nameser.h -add_subdirectory( kpac ) -add_subdirectory( kntlm ) +add_subdirectory(kpac) +add_subdirectory(kntlm) ########### next target ############### -set(kmailservice_SRCS kmailservice.cpp ) +add_executable(kmailservice kmailservice.cpp) +target_link_libraries(kmailservice ${KDE4_KDEUI_LIBS}) -add_executable(kmailservice ${kmailservice_SRCS}) - -target_link_libraries(kmailservice ${KDE4_KDEUI_LIBS}) - -install(TARGETS kmailservice ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS kmailservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( + TARGETS kmailservice + ${INSTALL_TARGETS_DEFAULT_ARGS} +) +install( + PROGRAMS kmailservice.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) ########### next target ############### -set(ktelnetservice_SRCS ktelnetservice.cpp ) +add_executable(ktelnetservice ktelnetservice.cpp) -add_executable(ktelnetservice ${ktelnetservice_SRCS}) +target_link_libraries(ktelnetservice ${KDE4_KDEUI_LIBS}) -target_link_libraries(ktelnetservice ${KDE4_KDEUI_LIBS} ) - -install(TARGETS ktelnetservice ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS ktelnetservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( + TARGETS ktelnetservice + ${INSTALL_TARGETS_DEFAULT_ARGS} +) +install( + PROGRAMS ktelnetservice.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) ########### install files ############### -install( FILES rtsp.protocol mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( + FILES + rtsp.protocol + mms.protocol + mmst.protocol + mmsu.protocol + pnm.protocol + rtspt.protocol + rtspu.protocol + DESTINATION ${SERVICES_INSTALL_DIR} +) -install(PROGRAMS fileshareset DESTINATION ${LIBEXEC_INSTALL_DIR} ) +install( + PROGRAMS fileshareset + DESTINATION ${LIBEXEC_INSTALL_DIR} +) install(CODE " set(FILESHARESET_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/fileshareset\") @@ -43,4 +63,6 @@ install(CODE " # write a cmake script file which creates the symlink file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIBEXEC_INSTALL_DIR}/fileshareset \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/filesharelist\")\n") # and add it as post-install script to any of the installed targets, so it will be executed during "make install" -set_target_properties(ktelnetservice PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake) +set_target_properties(ktelnetservice PROPERTIES + POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake +) diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt index 8bdd3aa8..c7ddaff0 100644 --- a/kio/misc/kntlm/CMakeLists.txt +++ b/kio/misc/kntlm/CMakeLists.txt @@ -1,13 +1,25 @@ - set(kntlm_LIB_SRCS kntlm.cpp des.cpp ) add_library(kntlm ${LIBRARY_TYPE} ${kntlm_LIB_SRCS}) -target_link_libraries(kntlm ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kntlm ${KDE4_KDECORE_LIBS}) -set_target_properties(kntlm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) +set_target_properties(kntlm PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) -install(TARGETS kntlm EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kntlm + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) -install( FILES kntlm_export.h kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel) +install( + FILES + kntlm_export.h + kntlm.h + DESTINATION ${INCLUDE_INSTALL_DIR}/kio + COMPONENT Devel +) diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt index 4c9180e5..9d5b3a80 100644 --- a/kio/misc/kpac/CMakeLists.txt +++ b/kio/misc/kpac/CMakeLists.txt @@ -1,59 +1,80 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(KPAC_NO_SOLID TRUE) -endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) +endif() -include_directories( ${CMAKE_SOURCE_DIR}/kded ) +include_directories(${CMAKE_SOURCE_DIR}/kded) if(NOT KPAC_NO_SOLID) - include_directories(${CMAKE_BINARY_DIR}/solid/) - include_directories(${CMAKE_SOURCE_DIR}/solid/) - set(KPAC_EXTRA_LIBS ${KDE4_SOLID_LIBS}) -endif(NOT KPAC_NO_SOLID) + include_directories(${CMAKE_BINARY_DIR}/solid) + include_directories(${CMAKE_SOURCE_DIR}/solid) + set(KPAC_EXTRA_LIBS ${KDE4_SOLID_LIBS}) +endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") + include(ConfigureChecks.cmake) -configure_file(config-kpac.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpac.h) +configure_file( + config-kpac.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config-kpac.h +) ########### next target ############### set(kded_proxyscout_PART_SRCS - proxyscout.cpp - script.cpp - downloader.cpp - discovery.cpp + proxyscout.cpp + script.cpp + downloader.cpp + discovery.cpp ) kde4_add_plugin(kded_proxyscout ${kded_proxyscout_PART_SRCS}) -target_link_libraries(kded_proxyscout ${QT_QTSCRIPT_LIBRARY} ${KPAC_EXTRA_LIBS} ${KDE4_KDECORE_LIBS} kio) +target_link_libraries(kded_proxyscout + ${QT_QTSCRIPT_LIBRARY} + ${KPAC_EXTRA_LIBS} + ${KDE4_KDECORE_LIBS} + ${KDE4_KIO_LIBS} +) # this needs -lresolv e.g on Slackware, but not on FreeBSD -if (HAVE_RESOLV_LIBRARY) - target_link_libraries(kded_proxyscout resolv) -endif (HAVE_RESOLV_LIBRARY) +if(HAVE_RESOLV_LIBRARY) + target_link_libraries(kded_proxyscout resolv) +endif() -install(TARGETS kded_proxyscout DESTINATION ${PLUGIN_INSTALL_DIR} ) +install( + TARGETS kded_proxyscout + DESTINATION ${PLUGIN_INSTALL_DIR} +) ########### next target ############### -set(kpac_dhcp_helper_SRCS kpac_dhcp_helper.c) +add_executable(kpac_dhcp_helper kpac_dhcp_helper.c) -add_executable(kpac_dhcp_helper ${kpac_dhcp_helper_SRCS}) - -if (HAVE_NSL_LIBRARY) - # Assume Solaris - target_link_libraries(kpac_dhcp_helper nsl) -endif (HAVE_NSL_LIBRARY) +if(HAVE_NSL_LIBRARY) + # Assume Solaris + target_link_libraries(kpac_dhcp_helper nsl) +endif() if (HAVE_SOCKET_LIBRARY) - target_link_libraries(kpac_dhcp_helper socket) -endif (HAVE_SOCKET_LIBRARY) + target_link_libraries(kpac_dhcp_helper socket) +endif() -install(TARGETS kpac_dhcp_helper DESTINATION ${LIBEXEC_INSTALL_DIR} ) +install( + TARGETS kpac_dhcp_helper + DESTINATION ${LIBEXEC_INSTALL_DIR} +) ########### install files ############### -install( FILES proxyscout.notifyrc DESTINATION ${DATA_INSTALL_DIR}/proxyscout ) -install( FILES proxyscout.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install( + FILES + proxyscout.notifyrc + DESTINATION ${DATA_INSTALL_DIR}/proxyscout +) +install( + FILES + proxyscout.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded +) diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt index 4dde7a16..95b67b86 100644 --- a/kio/tests/CMakeLists.txt +++ b/kio/tests/CMakeLists.txt @@ -65,5 +65,5 @@ KIO_EXECUTABLE_TESTS( set(kfstest_SRCS kfstest.cpp kfdtest.cpp) kde4_add_manual_test(kfstest ${kfstest_SRCS}) -target_link_libraries(kfstest ${KDE4_KIO_LIBS} ) +target_link_libraries(kfstest ${KDE4_KIO_LIBS}) diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt index a2a7b2c9..3abb0738 100644 --- a/kioslave/file/CMakeLists.txt +++ b/kioslave/file/CMakeLists.txt @@ -1,35 +1,32 @@ - project(kioslave-file) -include_directories( ${KDE4_KIO_INCLUDES} ) +include_directories(${KDE4_KIO_INCLUDES}) include(ConfigureChecks.cmake) -configure_file(config-kioslave-file.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-file.h ) - +configure_file( + config-kioslave-file.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-file.h +) ########### next target ############### -set(kio_file_PART_SRCS file.cpp file_unix.cpp ) +set(kio_file_PART_SRCS file.cpp file_unix.cpp) kde4_add_plugin(kio_file ${kio_file_PART_SRCS}) -target_link_libraries(kio_file ${KDE4_KDECORE_LIBS} kio ) +target_link_libraries(kio_file ${KDE4_KDECORE_LIBS} kio) if (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS) target_link_libraries(kio_file -lvolmgt) -endif (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS) +endif() if(ACL_FOUND) - target_link_libraries(kio_file ${ACL_LIBS}) -endif(ACL_FOUND) + target_link_libraries(kio_file ${ACL_LIBS}) +endif() -install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - - - - +install(FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index 57f54fe3..2da88816 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -27,13 +27,17 @@ set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS knotifyconfig EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS knotifyconfig + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### -install( FILES knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - - - - - - +install( + FILES + knotifyconfig_export.h + knotifyconfigwidget.h + DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Devel +) diff --git a/knotify/tests/CMakeLists.txt b/knotify/tests/CMakeLists.txt index e4d5d29b..28d4c946 100644 --- a/knotify/tests/CMakeLists.txt +++ b/knotify/tests/CMakeLists.txt @@ -1,12 +1,12 @@ # This can be used for finding data files in the source dir, without installing them project(knotifytest) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../config ) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../config) ########### knotifytest ############### -set(knotifytest_SRCS main.cpp knotifytestwindow.cpp knotifytestview.ui) +set(knotifytest_SRCS main.cpp knotifytestwindow.cpp) kde4_add_manual_test(knotifytest ${knotifytest_SRCS}) -target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig ) +target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig) diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt index 1edef62c..7ade3754 100644 --- a/kparts/CMakeLists.txt +++ b/kparts/CMakeLists.txt @@ -6,47 +6,82 @@ endif() include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR}) - ########### next target ############### set(kparts_LIB_SRCS - part.cpp - plugin.cpp - partmanager.cpp - mainwindow.cpp - event.cpp - browserextension.cpp - factory.cpp - historyprovider.cpp - browserinterface.cpp - browserrun.cpp - browseropenorsavequestion.cpp - statusbarextension.cpp - scriptableextension.cpp - textextension.cpp - htmlextension.cpp - fileinfoextension.cpp - listingextension.cpp + part.cpp + plugin.cpp + partmanager.cpp + mainwindow.cpp + event.cpp + browserextension.cpp + factory.cpp + historyprovider.cpp + browserinterface.cpp + browserrun.cpp + browseropenorsavequestion.cpp + statusbarextension.cpp + scriptableextension.cpp + textextension.cpp + htmlextension.cpp + fileinfoextension.cpp + listingextension.cpp ) add_library(kparts ${LIBRARY_TYPE} ${kparts_LIB_SRCS}) target_link_libraries(kparts PRIVATE ${KDE4_KDECORE_LIBS} kdeui kio) -target_link_libraries(kparts PUBLIC kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) +target_link_libraries(kparts PUBLIC + kio + kdeui + kdecore + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} +) set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS kparts EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kparts + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### -install( FILES kpart.desktop krop.desktop krwp.desktop browserview.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kparts_export.h part.h plugin.h partmanager.h mainwindow.h event.h - browserextension.h factory.h historyprovider.h browserinterface.h - componentfactory.h browserrun.h statusbarextension.h browseropenorsavequestion.h - scriptableextension.h textextension.h htmlextension.h fileinfoextension.h - listingextension.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kparts COMPONENT Devel ) +install( + FILES + kpart.desktop + krop.desktop + krwp.desktop + browserview.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + +install( + FILES + kparts_export.h + part.h + plugin.h + partmanager.h + mainwindow.h + event.h + browserextension.h + factory.h + historyprovider.h + browserinterface.h + componentfactory.h + browserrun.h + statusbarextension.h + browseropenorsavequestion.h + scriptableextension.h + textextension.h + htmlextension.h + fileinfoextension.h + listingextension.h + DESTINATION ${INCLUDE_INSTALL_DIR}/kparts + COMPONENT Devel +) diff --git a/kparts/tests/CMakeLists.txt b/kparts/tests/CMakeLists.txt index 97871172..03a261f8 100644 --- a/kparts/tests/CMakeLists.txt +++ b/kparts/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories( ${KDE4_KPARTS_INCLUDES} ) +include_directories(${KDE4_KPARTS_INCLUDES}) ########### next target ############### @@ -10,7 +10,7 @@ set(kpartstest_SRCS kde4_add_manual_test(kparts-kpartstest ${kpartstest_SRCS}) -target_link_libraries(kparts-kpartstest ${KDE4_KPARTS_LIBS} ) +target_link_libraries(kparts-kpartstest ${KDE4_KPARTS_LIBS}) ########### next target ############### @@ -23,7 +23,7 @@ set(normalktmtest_SRCS kde4_add_manual_test(kparts-normalktmtest ${normalktmtest_SRCS}) -target_link_libraries(kparts-normalktmtest ${KDE4_KPARTS_LIBS} ) +target_link_libraries(kparts-normalktmtest ${KDE4_KPARTS_LIBS}) ########### next target ############### @@ -34,22 +34,22 @@ set(partviewer_SRCS kde4_add_manual_test(kparts-partviewer ${partviewer_SRCS}) -target_link_libraries(kparts-partviewer ${KDE4_KPARTS_LIBS} ) +target_link_libraries(kparts-partviewer ${KDE4_KPARTS_LIBS}) ########### test prog for "open or save question" ############### kde4_add_manual_test(kparts-openorsavequestion openorsavequestion.cpp) -target_link_libraries(kparts-openorsavequestion ${KDE4_KPARTS_LIBS} ) +target_link_libraries(kparts-openorsavequestion ${KDE4_KPARTS_LIBS}) ########### next target ############### -set(spellcheckplugin_PART_SRCS plugin_spellcheck.cpp ) +set(spellcheckplugin_PART_SRCS plugin_spellcheck.cpp) kde4_add_plugin(spellcheckplugin ${spellcheckplugin_PART_SRCS}) -target_link_libraries(spellcheckplugin ${KDE4_KPARTS_LIBS} ) +target_link_libraries(spellcheckplugin ${KDE4_KPARTS_LIBS}) -install(TARGETS spellcheckplugin DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS spellcheckplugin DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### @@ -58,11 +58,11 @@ set(notepadpart_PART_SRCS notepad.cpp) kde4_add_plugin(notepadpart ${notepadpart_PART_SRCS}) -target_link_libraries(notepadpart ${KDE4_KPARTS_LIBS} ) +target_link_libraries(notepadpart ${KDE4_KPARTS_LIBS}) target_compile_definitions(notepadpart PRIVATE -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/") -install(TARGETS notepadpart DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS notepadpart DESTINATION ${PLUGIN_INSTALL_DIR}) ########### unit tests ############### diff --git a/kpty/CMakeLists.txt b/kpty/CMakeLists.txt index db0b1f63..af6910b4 100644 --- a/kpty/CMakeLists.txt +++ b/kpty/CMakeLists.txt @@ -10,21 +10,31 @@ set(kpty_LIB_SRCS add_library(kpty ${LIBRARY_TYPE} ${kpty_LIB_SRCS}) -target_link_libraries(kpty PRIVATE ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY} ${UTEMPTER_LIBRARY}) +target_link_libraries(kpty PRIVATE + ${KDE4_KDECORE_LIBS} + ${UTIL_LIBRARY} + ${UTEMPTER_LIBRARY} +) target_link_libraries(kpty PUBLIC kdecore ${QT_QTCORE_LIBRARY}) set_target_properties(kpty PROPERTIES - VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) +install( + TARGETS kpty + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(TARGETS kpty EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES - kpty_export.h - kpty.h - kptydevice.h - kptyprocess.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel +install( + FILES + kpty_export.h + kpty.h + kptydevice.h + kptyprocess.h + DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Devel ) ########### next target ############### @@ -33,8 +43,8 @@ if(NOT HAVE_OPENPTY) add_executable(kgrantpty kgrantpty.c) target_link_libraries(kgrantpty kdefakes) install(TARGETS kgrantpty DESTINATION ${LIBEXEC_INSTALL_DIR}) -endif(NOT HAVE_OPENPTY) +endif() if(ENABLE_TESTING) - add_subdirectory( tests ) + add_subdirectory(tests) endif() diff --git a/kpty/tests/CMakeLists.txt b/kpty/tests/CMakeLists.txt index 806dc07b..a049c873 100644 --- a/kpty/tests/CMakeLists.txt +++ b/kpty/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories( ${KDE4_KPTY_INCLUDES} ) +include_directories(${KDE4_KPTY_INCLUDES}) kde4_add_test(kptyprocesstest kptyprocesstest.cpp) target_link_libraries(kptyprocesstest ${KDE4_KPTY_LIBS} ${QT_QTTEST_LIBRARY}) diff --git a/kross/CMakeLists.txt b/kross/CMakeLists.txt index df16dcde..0a2bd599 100644 --- a/kross/CMakeLists.txt +++ b/kross/CMakeLists.txt @@ -1,16 +1,9 @@ -# the core library -add_subdirectory( core ) -# the ui library -add_subdirectory( ui ) -# optional modules -add_subdirectory( modules ) -# commandline-prog to run scripts -add_subdirectory( console ) +add_subdirectory(core) +add_subdirectory(ui) +add_subdirectory(modules) +add_subdirectory(console) +add_subdirectory(qts) -# unittests and such stuff if(ENABLE_TESTING) - add_subdirectory( test ) + add_subdirectory(test) endif() - -# QtScript backend -add_subdirectory( qts ) diff --git a/kross/console/CMakeLists.txt b/kross/console/CMakeLists.txt index bef8557e..58c0e59d 100644 --- a/kross/console/CMakeLists.txt +++ b/kross/console/CMakeLists.txt @@ -7,5 +7,5 @@ include_directories( set(kross_SRCS main.cpp ) add_executable(kross ${kross_SRCS}) -target_link_libraries(kross ${KDE4_KDEUI_LIBS} krosscore ) +target_link_libraries(kross ${KDE4_KDEUI_LIBS} krosscore) install(TARGETS kross ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kross/core/CMakeLists.txt b/kross/core/CMakeLists.txt index 1e59c4f0..086ed592 100644 --- a/kross/core/CMakeLists.txt +++ b/kross/core/CMakeLists.txt @@ -19,8 +19,6 @@ add_library(krosscore ${LIBRARY_TYPE} ${krosscore_LIB_SRCS}) target_link_libraries(krosscore PRIVATE ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${QT_QTSCRIPT_LIBRARY} - ${QT_QTXML_LIBRARY} ) target_link_libraries(krosscore PUBLIC kdecore @@ -33,9 +31,14 @@ set_target_properties(krosscore PROPERTIES SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS krosscore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS krosscore + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) -install(FILES +install( + FILES kross_export.h krossconfig.h errorinterface.h @@ -49,4 +52,6 @@ install(FILES actioncollection.h manager.h object.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kross/core COMPONENT Devel) + DESTINATION ${INCLUDE_INSTALL_DIR}/kross/core + COMPONENT Devel +) diff --git a/kross/modules/CMakeLists.txt b/kross/modules/CMakeLists.txt index d245fd8a..49042030 100644 --- a/kross/modules/CMakeLists.txt +++ b/kross/modules/CMakeLists.txt @@ -6,22 +6,30 @@ include_directories( ${CMAKE_SOURCE_DIR}/kfile ) -if( QT_QTDESIGNER_FOUND ) - ############################################ - # the forms module +if(QT_QTDESIGNER_FOUND ) + ############################################ + # the forms module - set(krossmoduleforms_SRCS form.cpp) - kde4_add_plugin(krossmoduleforms ${krossmoduleforms_SRCS}) + kde4_add_plugin(krossmoduleforms form.cpp) - target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui) - install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR}) -endif( QT_QTDESIGNER_FOUND ) + target_link_libraries(krossmoduleforms + ${QT_QTUITOOLS_LIBRARY} + ${KDE4_KPARTS_LIBS} + ${KDE4_KFILE_LIBS} + krosscore + krossui + ) + install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR}) +endif() ############################################ # the kdetranslation module -set(krossmodulekdetranslation_SRCS translation.cpp) -kde4_add_plugin(krossmodulekdetranslation ${krossmodulekdetranslation_SRCS}) +kde4_add_plugin(krossmodulekdetranslation translation.cpp) -target_link_libraries(krossmodulekdetranslation ${KDE4_KPARTS_LIBS} ${KDE4_CORE_LIBS} krosscore) +target_link_libraries(krossmodulekdetranslation + ${KDE4_KPARTS_LIBS} + ${KDE4_CORE_LIBS} + krosscore +) install(TARGETS krossmodulekdetranslation DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kross/test/CMakeLists.txt b/kross/test/CMakeLists.txt index 6ac84dae..9a8973a2 100644 --- a/kross/test/CMakeLists.txt +++ b/kross/test/CMakeLists.txt @@ -1,13 +1,10 @@ -set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories(${KDE4_KIO_INCLUDES}) -set(krosstest_SRCS - testobject.cpp +set(krosstest_SRCS + testobject.cpp main.cpp ) - kde4_add_manual_test(krosstest ${krosstest_SRCS}) -target_link_libraries(krosstest ${KDE4_KDEUI_LIBS} krosscore ) - +target_link_libraries(krosstest ${KDE4_KDEUI_LIBS} krosscore) diff --git a/kross/ui/CMakeLists.txt b/kross/ui/CMakeLists.txt index 76392e18..696ba96a 100644 --- a/kross/ui/CMakeLists.txt +++ b/kross/ui/CMakeLists.txt @@ -5,24 +5,39 @@ include_directories( ${KDE4_KIO_INCLUDES} ) - set(krossui_LIB_SRCS - model.cpp - view.cpp - plugin.cpp -# guiclient.cpp - ) + model.cpp + view.cpp + plugin.cpp + # guiclient.cpp +) add_library(krossui ${LIBRARY_TYPE} ${krossui_LIB_SRCS}) -target_link_libraries(krossui krosscore ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS}) -set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} - ) - - -install(TARGETS krossui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +target_link_libraries(krossui + krosscore + ${KDE4_KDEUI_LIBS} + ${KDE4_KPARTS_LIBS} + ${KDE4_KIO_LIBS} +) +set_target_properties(krossui PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) ########### install files ############### -#install(FILES guiclient.h model.h view.h DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui) -install(FILES model.h view.h plugin.h DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui COMPONENT Devel) +install( + TARGETS krossui + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) + +install( + FILES + # guiclient.h + model.h + view.h + plugin.h + DESTINATION ${INCLUDE_INSTALL_DIR}/kross/ui + COMPONENT Devel +) diff --git a/kunitconversion/CMakeLists.txt b/kunitconversion/CMakeLists.txt index 68920b4e..b621e470 100644 --- a/kunitconversion/CMakeLists.txt +++ b/kunitconversion/CMakeLists.txt @@ -5,7 +5,10 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(KUNITCONVERSION_NO_KIO TRUE) endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kunitconversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kunitconversion.h) +configure_file( + config-kunitconversion.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/config-kunitconversion.h +) if(ENABLE_TESTING) add_subdirectory(tests) @@ -35,34 +38,64 @@ set(kunitconversion_LIB_SRCS frequency.cpp ) -set(kunitconversion_HEADERS +add_definitions(-DKDE_DEFAULT_DEBUG_AREA=930) + +if(NOT KUNITCONVERSION_NO_KIO) + include_directories(${KDE4_KIO_INCLUDES}) + set(KUNITCONVERSION_EXTRA_LIBS + ${KUNITCONVERSION_EXTRA_LIBS} + ${KDE4_KIO_LIBS} + ) +else() + set(KUNITCONVERSION_EXTRA_LIBS + ${KUNITCONVERSION_EXTRA_LIBS} + ${QT_QTNETWORK_LIBRARY} + ${QT_QTXML_LIBRARY} + ) +endif() + +if(NOT KUNITCONVERSION_NO_SOLID) + include_directories( + ${CMAKE_BINARY_DIR}/solid + ${CMAKE_SOURCE_DIR}/solid + ) + set(KUNITCONVERSION_EXTRA_LIBS + ${KUNITCONVERSION_EXTRA_LIBS} + ${KDE4_SOLID_LIBS} + ) +endif() + +include_directories( + ${CMAKE_SOURCE_DIR} + ${KDE4_KDECORE_INCLUDES} + ${KDE4_KDEUI_INCLUDES} +) + +add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS}) + +target_link_libraries(kunitconversion + ${KDE4_KDECORE_LIBS} + ${KUNITCONVERSION_EXTRA_LIBS} +) + +set_target_properties(kunitconversion PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} +) + +install( + TARGETS kunitconversion + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) + +install( + FILES converter.h value.h unit.h unitcategory.h kunitconversion_export.h + DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion + COMPONENT Devel ) - -add_definitions(-DKDE_DEFAULT_DEBUG_AREA=930) - -if(NOT KUNITCONVERSION_NO_KIO) - include_directories(${KDE4_KIO_INCLUDES}) - set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${KDE4_KIO_LIBS}) -else(NOT KUNITCONVERSION_NO_KIO) - set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}) -endif(NOT KUNITCONVERSION_NO_KIO) - -if(NOT KUNITCONVERSION_NO_SOLID) - include_directories(${CMAKE_BINARY_DIR}/solid/) - include_directories(${CMAKE_SOURCE_DIR}/solid/) - set(KUNITCONVERSION_EXTRA_LIBS ${KUNITCONVERSION_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) -endif(NOT KUNITCONVERSION_NO_SOLID) - -include_directories (${CMAKE_SOURCE_DIR} ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES}) - - -add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS}) -target_link_libraries(kunitconversion ${KDE4_KDECORE_LIBS} ${KUNITCONVERSION_EXTRA_LIBS}) -set_target_properties(kunitconversion PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) -install(TARGETS kunitconversion EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES ${kunitconversion_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion COMPONENT Devel)