Recent svn snapshot fails to build on kde-4.4.x , intentional?

[Rex Dieter]

Rex Dieter wrote:

> Lamarque Vieira Souza wrote:
> 
>> It compiles here against kde-4.4.4 in OpenSuse 11.2 (with kde packages
>> from OpenSuse 11.3) and NetworkManager 0.8. One thing I needed to do to
>> finish the compiling was changing KDE4_KCMUTILS_LIBS to KDE4_KUTILS_LIBS
>> in applet/CMakeLists.txt, settings/configshell/CMakeLists.txt and
>> settings/config/CMakeLists.txt.
> 
> 
> That's it!  KDE4_KCMUTILS_LIBS doesn't exist in kde-4.4
> 
> I'll see about whipping up a patch to conditionalize this

patch inline (arg, attachments are crashing knode for me here).

-- Rex

diff -up networkmanagement-0.9/applet/CMakeLists.txt.KUTILS_LIBS 
networkmanagement-0.9/applet/CMakeLists.txt
--- networkmanagement-0.9/applet/CMakeLists.txt.KUTILS_LIBS	
2010-08-30 17:43:18.000000000 -0500
+++ networkmanagement-0.9/applet/CMakeLists.txt	2010-09-07 
13:14:51.743818273 -0500
@@ -26,7 +26,6 @@ set(networkmanager_SRCS
     )
 
 kde4_add_plugin(plasma_applet_networkmanagement ${networkmanager_SRCS})
-target_link_libraries(plasma_applet_networkmanagement ${KDE4_PLASMA_LIBS} 
knmclient knminternals ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol 
${KDE4_KCMUTILS_LIBS})
 
 install(TARGETS plasma_applet_networkmanagement DESTINATION 
${PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-networkmanagement.desktop DESTINATION 
${SERVICES_INSTALL_DIR})
@@ -39,4 +38,7 @@ if (NOT IS45)
     install(FILES
         network.svgz
         DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/icons/)
+    target_link_libraries(plasma_applet_networkmanagement 
${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} 
${KDE4_SOLID_LIBS} solidcontrol ${KDE4_KUTILS_LIBS})
+else (NOT IS45)
+    target_link_libraries(plasma_applet_networkmanagement 
${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} 
${KDE4_SOLID_LIBS} solidcontrol ${KDE4_KCMUTILS_LIBS})
 endif (NOT IS45)
diff -up networkmanagement-0.9/settings/config/CMakeLists.txt.KUTILS_LIBS 
networkmanagement-0.9/settings/config/CMakeLists.txt
--- networkmanagement-0.9/settings/config/CMakeLists.txt.KUTILS_LIBS	
2010-08-30 17:43:20.000000000 -0500
+++ networkmanagement-0.9/settings/config/CMakeLists.txt	2010-09-07 
13:18:15.699057553 -0500
@@ -18,7 +18,12 @@ set(kcm_networkmanagement_SRCS
 kde4_add_ui_files(kcm_networkmanagement_SRCS manageconnectionwidget.ui 
menutooltipsettingswidget.ui traysettings.ui)
 kde4_add_plugin(kcm_networkmanagement ${kcm_networkmanagement_SRCS})
 
-target_link_libraries(kcm_networkmanagement knmui knminternals solidcontrol 
${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
+macro_ensure_version("4.4.76" ${KDE_VERSION} IS45)
+if (IS45)
+   target_link_libraries(kcm_networkmanagement knmui knminternals 
solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
+else (IS45)
+   target_link_libraries(kcm_networkmanagement knmui knminternals 
solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS})
+endif (IS45)
 
 ## next target: tray config KCM
 
diff -up 
networkmanagement-0.9/settings/configshell/CMakeLists.txt.KUTILS_LIBS 
networkmanagement-0.9/settings/configshell/CMakeLists.txt
--- networkmanagement-0.9/settings/configshell/CMakeLists.txt.KUTILS_LIBS	
2010-08-30 17:43:20.000000000 -0500
+++ networkmanagement-0.9/settings/configshell/CMakeLists.txt	
2010-09-07 13:18:53.667797710 -0500
@@ -14,7 +14,13 @@ set(networkmanagement_configshell_SRCS
 
 kde4_add_executable(networkmanagement_configshell 
${networkmanagement_configshell_SRCS})
 
-target_link_libraries(networkmanagement_configshell knmui knminternals 
solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
+macro_ensure_version("4.4.76" ${KDE_VERSION} IS45)
+if (IS45)
+   target_link_libraries(networkmanagement_configshell knmui knminternals 
solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
+else (IS45)
+   target_link_libraries(networkmanagement_configshell knmui knminternals 
solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS})
+endif (IS45)
+
 
 install(TARGETS networkmanagement_configshell DESTINATION 
${LIBEXEC_INSTALL_DIR})