* cmake/dbus/CMakeLists.txt,cmake/bus/CMakeLists.txt,

cmake/CMakeLists.txt: win32 compile fix

diff --git a/ChangeLog b/ChangeLog
index e6641d6..13425c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-06  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * cmake/dbus/CMakeLists.txt,cmake/bus/CMakeLists.txt,
+       cmake/CMakeLists.txt: win32 compile fix
+
 2007-03-04  Ralf Habacker  <ralf.habacker@freenet.de>
 
        * dbus-win.patch, README.win: added available win32 

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index ded5cb0..c2dbf06 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -449,8 +449,6 @@ if (DBUS_BUILD_TESTS)
        add_subdirectory( test )
 endif (DBUS_BUILD_TESTS)
 add_subdirectory( tools )
-# small sized pkg-config emulation
-add_subdirectory( pkg-config )
 
 
 OPTION(DBUS_INSTALL_SYSTEM_LIBS "install required system libraries" OFF)

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 79629e9..dfef959 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -50,7 +50,7 @@ set (BUS_SOURCES
        ${BUS_DIR}/connection.h                         
        ${BUS_DIR}/desktop-file.c                               
        ${BUS_DIR}/desktop-file.h                               
-       ${BUS_DIR}/dir-watch.c                          
+       ${BUS_DIR}/dir-watch-default.c                          
        ${BUS_DIR}/dir-watch.h                          
        ${BUS_DIR}/dispatch.c                           
        ${BUS_DIR}/dispatch.h                           

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 754c5cb..839554b 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -62,9 +62,14 @@ set (DBUS_LIB_SOURCES
 #
 #  find a clean Windows implementation
 #  and move code to a *-win.c file
-       ${DBUS_DIR}/dbus-transport-unix.c
-       ${DBUS_DIR}/dbus-server-unix.c
 )
+if(UNIX)
+    set (DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES} 
+           ${DBUS_DIR}/dbus-transport-unix.c
+           ${DBUS_DIR}/dbus-server-unix.c
+       )
+endif(UNIX)
+
 set (DBUS_LIB_HEADERS
        ${DBUS_DIR}/dbus-auth.h
        ${DBUS_DIR}/dbus-auth-script.h