move all tdehw stuff into separate subdir

tdecore/CMakeLists.txt

@@ -12,61 +12,20 @@
 add_subdirectory( malloc )
 add_subdirectory( network )
 add_subdirectory( tdeconfig_compiler )
-add_subdirectory( hwlibdata )
-add_subdirectory( hwlibdaemons )
-
-if( NOT DBUS_SYSTEM_BUS )
-  set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
-endif()
-
-if( WITH_UPOWER )
-  add_definitions( -DWITH_UPOWER )
-  set ( TDEUPOWER_INCLUDE_DIRECTORIES
-    ${DBUS_TQT_INCLUDE_DIRS}
-  )
-  set ( TDEUPOWER_LIBRARIES
-    ${DBUS_TQT_LIBRARIES}
-  )
-endif( )
-
-if( WITH_UDISKS )
-  add_definitions( -DWITH_UDISKS )
-endif( )
-
-if( WITH_UDISKS2 )
-  add_definitions( -DWITH_UDISKS2 )
-endif( )
-
-if( WITH_CONSOLEKIT )
-  add_definitions( -DWITH_CONSOLEKIT )
-endif( )
+add_subdirectory( tdehw )
 
 if( WITH_LIBART )
   add_subdirectory( svgicons )
   set( KDESVGICONS kdesvgicons-static )
 endif( WITH_LIBART )
 
-if( WITH_NETWORK_MANAGER_BACKEND )
-  add_subdirectory( networkbackends/network-manager/dbus )
-  set ( TDENM_INCLUDE_DIRECTORIES
-    ${DBUS_TQT_INCLUDE_DIRS}
-    ${NM_UTIL_INCLUDE_DIRS}
-    "${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus"
-  )
-  set ( TDENM_LIBRARIES
-    tdenm_dbus-static
-    ${DBUS_TQT_LIBRARIES}
-  )
-  set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )
-endif( WITH_NETWORK_MANAGER_BACKEND )
-
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/network
+  ${CMAKE_CURRENT_SOURCE_DIR}/tdehw
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/libltdl
   ${CMAKE_SOURCE_DIR}/tdefx
@@ -75,8 +34,6 @@ include_directories(
   ${LIBART_INCLUDE_DIRS}
   ${LIBIDN_INCLUDE_DIRS}
   ${GAMIN_INCLUDEDIR}
-  ${TDENM_INCLUDE_DIRECTORIES}
-  ${TDEUPOWER_INCLUDE_DIRECTORIES}
 )
 
 link_directories(
@@ -111,8 +68,7 @@ install( FILES
     kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
     kmanagerselection.h kmountpoint.h kuser.h klockfile.h
     kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h
-    tdelibs_export.h kde_file.h ktimezones.h tdehardwaredevices.h
-    tdenetworkconnections.h
+    tdelibs_export.h kde_file.h ktimezones.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
@@ -168,16 +124,15 @@ set( ${target}_SRCS
   ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
   kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
   kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp
-  kqiodevicegzip_p.cpp ktimezones.cpp tdehardwaredevices.cpp tdenetworkconnections.cpp
-  ksimpledirwatch.cpp
-  ${TDENM_BACKEND_SOURCES}
+  kqiodevicegzip_p.cpp ktimezones.cpp ksimpledirwatch.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  EMBED tdecorenetwork-static
-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES}
+  EMBED tdecorenetwork-static tdehw-static
+  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
+    ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )

tdecore/tdehw/CMakeLists.txt

@@ -0,0 +1,82 @@
+#################################################
+#
+#  (C) 2013 Golubev Alexander
+#  fatzer2 (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( hwlibdata )
+add_subdirectory( hwlibdaemons )
+add_subdirectory( networkbackends )
+
+if( NOT DBUS_SYSTEM_BUS )
+  set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
+endif()
+
+if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
+    WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
+  list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
+  list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
+  list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} )
+endif( )
+
+if( WITH_UPOWER )
+  add_definitions( -DWITH_UPOWER )
+endif( )
+
+if( WITH_UDISKS )
+  add_definitions( -DWITH_UDISKS )
+endif( )
+
+if( WITH_UDISKS2 )
+  add_definitions( -DWITH_UDISKS2 )
+endif( )
+
+if( WITH_CONSOLEKIT )
+  add_definitions( -DWITH_CONSOLEKIT )
+endif( )
+
+if( WITH_NETWORK_MANAGER_BACKEND )
+  list( APPEND TDEHW_CUSTOM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus )
+  list( APPEND TDEHW_CUSTOM_LIBRARIES network_manager_backend-static )
+endif( WITH_NETWORK_MANAGER_BACKEND )
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/dcop
+  ${TDEHW_CUSTOM_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDEHW_CUSTOM_LIBRARY_DIRS}
+)
+
+##### headers ###################################
+
+install( FILES tdehardwaredevices.h tdenetworkconnections.h
+  DESTINATION ${INCLUDE_INSTALL_DIR} )
+
+
+##### libtdecore ################################
+
+set( target tdehw )
+
+set( ${target}_SRCS
+  tdehardwaredevices.cpp tdenetworkconnections.cpp
+)
+
+tde_add_library( ${target} STATIC_PIC AUTOMOC
+  SOURCES ${${target}_SRCS}
+  LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES}
+    ${TDEHW_CUSTOM_LIBRARIES}
+)

tdecore/tdehw/networkbackends/CMakeLists.txt

@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2013 Golubev Alexander
+#  fatzer2 (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_conditional_add_subdirectory( WITH_NETWORK_MANAGER_BACKEND network-manager )

tdecore/tdehw/networkbackends/network-manager/CMakeLists.txt

@@ -0,0 +1,36 @@
+#################################################
+#
+#  (C) 2013 Golubev Alexander
+#  fatzer2 (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( dbus-introspection )
+
+include_directories (
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${DBUS_TQT_INCLUDE_DIRS}
+  ${NM_UTIL_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdecore/tdehw
+  ${CMAKE_CURRENT_BINARY_DIR}/dbus-introspection
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${DBUS_TQT_LIBRARY_DIRS}
+)
+
+tde_add_library( network_manager_backend STATIC_PIC AUTOMOC
+  SOURCES network-manager.cpp
+  EMBED tdenm_dbus-static
+  LINK tdenm_dbus-static ${DBUS_TQT_LIBRARIES}
+)

tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt

@@ -18,7 +18,7 @@ include_directories(
 
 ##### tdenm_dbus (static) #########################
 
-set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/tdecore/networkbackends/network-manager/introspection" )
+set( INTROSPECTIONPATH ${CMAKE_CURRENT_SOURCE_DIR} )
 
 # options:
 #  p - generate proxy files
@@ -71,6 +71,11 @@ add_custom_command( OUTPUT mocfiles.cpp
   COMMAND cat ${_moc_files} > mocfiles.cpp
   DEPENDS ${_moc_files} )
 
+# tde_automoc( accesspointproxy.h deviceproxy.h networkmanagerproxy.h
+#   networkmanagerpppproxy.h bluetoothproxy.h olpcmeshproxy.h
+#   ethernetproxy.h infinibandproxy.h wifiproxy.h wimaxproxy.h
+#   activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h
+#   modemproxy.h networkmanagersettings.h connectionsettings.h ) 
 
 # build the library