diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-06 20:51:02 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-06 20:51:02 +0000 |
| commit | 4b876d8cb40cc3e682ef842e6af60b4d88d03f46 (patch) | |
| tree | a237457323f63b7726e60d6a70742971a4cf190e /cmake | |
| parent | 51e88a912a893ffc45298cc0ddca3b556193570f (diff) | |
* cmake/dbus/CMakeLists.txt,cmake/bus/CMakeLists.txt,
cmake/CMakeLists.txt: win32 compile fix
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index ded5cb0c..c2dbf069 100644 --- 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 79629e96..dfef9599 100644 --- 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 754c5cb2..839554bf 100644 --- 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 |