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

List:       kgraphviewer-devel
Subject:    [kgraphviewer-devel] Port to KF5
From:       kleag () free ! fr
Date:       2016-05-01 22:16:31
Message-ID: 2115896673.269191010.1462140991188.JavaMail.root () zimbra61-e11 ! priv ! proxad ! net
[Download RAW message or body]

Hello,

I tried to compile the frameworks branch but it failed. Then I changed some=
 things by tries and failures and got it to compile and work with the attac=
hed patch.

Well, I'm not sure it's OK because I did not find a lot of documentation ab=
out the changes in the cmake commands for parts and not a lot of examples.

What do you think ?

Regards,

Ga=C3=ABl
["kgraphviewer.diff" (text/x-patch)]

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c06bfe..f9f6605 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(kgraphviewer LINK_PRIVATE
     KF5::KHtml
 )
 
-install( TARGETS kgraphviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install( TARGETS kgraphviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install kgraphviewer files ###############
 
@@ -36,15 +36,13 @@ ecm_install_icons(
     ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/16-apps-kgraphviewer.png
     ${CMAKE_CURRENT_SOURCE_DIR}/32-apps-kgraphviewer.png
-    DESTINATION
-    ${KDE_INSTALL_ICONDIR}
+    DESTINATION ${ICON_INSTALL_DIR}
     THEME hicolor
 )
 
-install( FILES kgraphviewersettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES kgraphviewersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES kgraphviewerui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kgraphviewer )
-install( PROGRAMS kgraphviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-
+install( PROGRAMS kgraphviewer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ########### kgrapheditor target ###############
 
@@ -63,14 +61,14 @@ target_link_libraries(kgrapheditor LINK_PRIVATE
     KF5::Parts
 )
 
-install( TARGETS kgrapheditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install( TARGETS kgrapheditor ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install kgrapheditor files ###############
 
-install(FILES kgrapheditorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install(FILES kgrapheditorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
 install(FILES kgrapheditorui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kgrapheditor)
-install(PROGRAMS kgrapheditor.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-install(FILES kgraphviewer.appdata.xml DESTINATION \
${KDE_INSTALL_DATAROOTDIR}/appdata/) +install(PROGRAMS kgrapheditor.desktop \
DESTINATION ${SERVICES_INSTALL_DIR} ) +install(FILES kgraphviewer.appdata.xml \
DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)  
 
 #add_subdirectory(plasmaapplet)
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
index 05c07cf..c6ea27b 100644
--- a/src/part/CMakeLists.txt
+++ b/src/part/CMakeLists.txt
@@ -52,7 +52,7 @@ target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg \
Qt5::PrintSupport Qt5::  set(KGRAPHVIEWER_SOVERSION "2")
 set_target_properties(kgraphviewerlib PROPERTIES VERSION 2.1 SOVERSION \
${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )  
-install( TARGETS kgraphviewerlib ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install( TARGETS kgraphviewerlib ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### next target ###############
@@ -64,7 +64,7 @@ add_library(kgraphviewerpart MODULE ${kgraphviewerpart_PART_SRCS})
 add_definitions(-DQT_STL)
 target_link_libraries(kgraphviewerpart Qt5::Core KF5::Parts gvc cgraph pathplan cdt \
kgraphviewerlib)  
-install( TARGETS kgraphviewerpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install( TARGETS kgraphviewerpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### configure AppStream metadata ###############
 configure_file(kgraphviewer.metainfo.xml.in \
"${CMAKE_CURRENT_BINARY_DIR}/kgraphviewer.metainfo.xml" IMMEDIATE @ONLY) @@ -73,17 \
+73,17 @@ configure_file(kgraphviewer.metainfo.xml.in \
"${CMAKE_CURRENT_BINARY_DIR}/kgraphv  
 kcoreaddons_desktop_to_json(kgraphviewerpart \
${CMAKE_CURRENT_SOURCE_DIR}/kgraphviewer_part.desktop)  
-install( FILES kgraphviewer_partsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES kgraphviewer_partsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES kgraphviewer_part.rc DESTINATION ${KXMLGUI_INSTALL_DIR} )
 
-install( FILES kgraphviewer_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-install( FILES chain.png DESTINATION ${KDE_INSTALL_DATADIR}/kgraphviewerpart/pics )
-install( FILES chain-broken.png DESTINATION \
                ${KDE_INSTALL_DATADIR}/kgraphviewerpart/pics )
-install( FILES kgraphviewer-bev.png DESTINATION \
                ${KDE_INSTALL_DATADIR}/kgraphviewerpart/pics )
-install( FILES kgraphviewer-newnode.png DESTINATION \
                ${KDE_INSTALL_DATADIR}/kgraphviewerpart/pics )
-install( FILES kgraphviewer-newedge.png DESTINATION \
                ${KDE_INSTALL_DATADIR}/kgraphviewerpart/pics )
-install( FILES "${CMAKE_CURRENT_BINARY_DIR}/kgraphviewer.metainfo.xml" DESTINATION \
                ${KDE_INSTALL_DATAROOTDIR}/appdata/ )
-
-install(FILES kgraphviewer_interface.h DESTINATION \
                ${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ COMPONENT Devel)
-install(FILES dotgraphview.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ \
                COMPONENT Devel)
-install(FILES kgraphviewer_export.h DESTINATION \
${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ COMPONENT Devel) +install( FILES \
kgraphviewer_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES \
chain.png DESTINATION ${DATA_INSTALL_DIR}/kgraphviewerpart/pics ) +install( FILES \
chain-broken.png DESTINATION ${DATA_INSTALL_DIR}/kgraphviewerpart/pics ) +install( \
FILES kgraphviewer-bev.png DESTINATION ${DATA_INSTALL_DIR}/kgraphviewerpart/pics ) \
+install( FILES kgraphviewer-newnode.png DESTINATION \
${DATA_INSTALL_DIR}/kgraphviewerpart/pics ) +install( FILES kgraphviewer-newedge.png \
DESTINATION ${DATA_INSTALL_DIR}/kgraphviewerpart/pics ) +install( FILES \
"${CMAKE_CURRENT_BINARY_DIR}/kgraphviewer.metainfo.xml" DESTINATION \
${SHARE_INSTALL_PREFIX}/appdata/ ) +
+# install(FILES kgraphviewer_interface.h DESTINATION \
${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ COMPONENT Devel) +# install(FILES \
dotgraphview.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ COMPONENT Devel) \
+# install(FILES kgraphviewer_export.h DESTINATION \
${KDE_INSTALL_INCLUDEDIR}/kgraphviewer/ COMPONENT Devel)


[Attachment #4 (text/plain)]

_______________________________________________
kgraphviewer-devel mailing list
kgraphviewer-devel@kde.org
https://mail.kde.org/mailman/listinfo/kgraphviewer-devel


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