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

List:       kde-commits
Subject:    KDE/kdelibs/dnssd
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-10-19 10:13:08
Message-ID: 20101019101308.42C5CAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187427 by ervin:

Make libkdnssd link only on kdecore in the mobile profile. For that I
had to remove the kcfg files and make them auto-generated by cmake
(hence the CreateKcfgFiles.cmake which basically replace them).


 M  +12 -3     CMakeLists.txt  
 A             CreateKcfgFiles.cmake  
 D             kcm_kdnssd.kcfg  
 D             settings.kcfgc  


--- trunk/KDE/kdelibs/dnssd/CMakeLists.txt #1187426:1187427
@@ -3,9 +3,18 @@
 macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI)
 macro_log_feature(AVAHI_FOUND "Avahi" "For Linux and BSDs: a system which \
facilitates service discovery on a local network, based on the Zeroconf standard" \
"http://avahi.org" FALSE "" "Enables KDE applications access to multicast DNS/DNS-SD \
service discovery.")  
+if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
+   include_directories( ${KDE4_KDECORE_INCLUDES} )
+   set(KDNSSD_BASE_LIBS ${KDE4_KDECORE_LIBS})
+else(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
 include_directories( ${KDE4_KDEUI_INCLUDES} )
+   set(KDNSSD_BASE_LIBS ${KDE4_KDEUI_LIBS})
+endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
+
+include(CreateKcfgFiles.cmake)
+
 set(kdnssd_LIB_SRCS  servicebase.cpp servicemodel.cpp domainmodel.cpp)
-kde4_add_kcfg_files(kdnssd_LIB_SRCS settings.kcfgc )
+kde4_add_kcfg_files(kdnssd_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/settings.kcfgc )
 
 if (HAVE_AVAHI) 
    include_directories( ${AVAHI_INCLUDE_DIR} )
@@ -58,9 +67,9 @@
 
 # KDE 5: don't link against KDEUI_LIBS (when settings.kfgc is changed)
 if (HAVE_DNSSD)
-  target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${DNSSD_LIBRARIES} \
${QT_QTNETWORK_LIBRARY}) +  target_link_libraries(kdnssd ${KDNSSD_BASE_LIBS} \
${DNSSD_LIBRARIES} ${QT_QTNETWORK_LIBRARY})  else (HAVE_DNSSD)
-  target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY})
+  target_link_libraries(kdnssd ${KDNSSD_BASE_LIBS} ${QT_QTNETWORK_LIBRARY})
 endif (HAVE_DNSSD)
 
 target_link_libraries(kdnssd  LINK_INTERFACE_LIBRARIES kdecore ${QT_QTCORE_LIBRARY} \
)


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