← Back to branch summary

~ubuntu-branches/ubuntu/natty/kde4libs/natty-proposed

« back to all changes in this revision

Viewing changes to solid/solid/CMakeLists.txt

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Jonathan Riddell, Scott Kitterman
  • Date: 2011-01-21 11:32:24 UTC
  • mfrom: (1.14.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110121113224-c9tebdkklj5u3awu
Tags: 4:4.6.0-0ubuntu1~ppa1
[ Jonathan Riddell ]
* New upstream release
* Reluctantly add kcm_ssl to kdelibs5-plugins, this should be in kdebase

[ Scott Kitterman ]
* Update libkatepartinterfaces4.symbols and libkdecore5.symbols for 4.5.95
  and confirm symbols on all architectures with pkgkde-symbolshelper
  - Thanks to Jonathan Thomas for verifying the missing symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
solid/solid/CMakeLists.txt
129
129
   backends/shared/cpufeatures.cpp
130
130
)
131
131
 
132
 
if(NOT APPLE)
133
 
  macro_optional_find_package( HUpnp )
134
 
  macro_log_feature( HUPNP_FOUND "HUPnP" "UPnP support for Solid" "http://www.herqq.org" FALSE "" "Allows Solid to provide information about UPnP devices on the network" )
135
 
 
136
 
  if ( HUPNP_FOUND )
137
 
    include_directories( ${HUPNP_INCLUDE_DIR} )
138
 
    message(STATUS "Building Solid UPnP backend." )
139
 
    set(solid_LIB_SRCS ${solid_LIB_SRCS}
140
 
 
141
 
       backends/upnp/upnpdevice.cpp
142
 
       backends/upnp/upnpdevicemanager.cpp
143
 
       backends/upnp/upnpdeviceinterface.cpp
144
 
       backends/upnp/upnpmediaserver.cpp
145
 
       backends/upnp/upnpinternetgateway.cpp
146
 
       backends/upnp/upnpcontrolpoint.cpp
147
 
    )
148
 
  endif( HUPNP_FOUND )
149
 
endif(NOT APPLE)
 
132
#if(NOT APPLE)
 
133
#  macro_optional_find_package( HUpnp )
 
134
#  macro_log_feature( HUPNP_FOUND "HUPnP" "UPnP support for Solid" "http://www.herqq.org" FALSE "" "Allows Solid to provide information about UPnP devices on the network" )
 
135
#
 
136
#  if ( HUPNP_FOUND )
 
137
#    include_directories( ${HUPNP_INCLUDE_DIR} )
 
138
#    message(STATUS "Building Solid UPnP backend." )
 
139
#    set(solid_LIB_SRCS ${solid_LIB_SRCS}
 
140
#
 
141
#       backends/upnp/upnpdevice.cpp
 
142
#       backends/upnp/upnpdevicemanager.cpp
 
143
#       backends/upnp/upnpdeviceinterface.cpp
 
144
#       backends/upnp/upnpmediaserver.cpp
 
145
#       backends/upnp/upnpinternetgateway.cpp
 
146
#       backends/upnp/upnpcontrolpoint.cpp
 
147
#    )
 
148
#  endif( HUPNP_FOUND )
 
149
#endif(NOT APPLE)
150
150
 
151
151
if(NOT WIN32 AND NOT APPLE)
152
152
#   message(STATUS "Building Solid KUPnP backend." )
348
348
 
349
349
kde4_add_library(solid ${LIBRARY_TYPE} ${solid_LIB_SRCS})
350
350
 
351
 
if ( HUPNP_FOUND )
352
 
   set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${HUPNP_LIBS})
353
 
endif( HUPNP_FOUND )
 
351
#if ( HUPNP_FOUND )
 
352
#   set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${HUPNP_LIBS})
 
353
#endif( HUPNP_FOUND )
354
354
 
355
355
if ( UDEV_FOUND )
356
356
   set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${UDEV_LIBS})