diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-01-05 11:49:13 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-01-05 11:49:48 +0100 |
| commit | ea54a97f0506df04b6d7be2af67a8c407b631823 (patch) | |
| tree | 39f64243cd0202b34ca6a2a6901d4ac93347b5db /cmake | |
| parent | fda9d8a44aa1bde4f2777fb9ad8650f45820fb6b (diff) | |
| parent | 01af167b55ee1507212a6ec6c01027ae1b471ff3 (diff) | |
| download | dbus-ea54a97f0506df04b6d7be2af67a8c407b631823.tar.gz | |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config.h.cmake | 4 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 8789cf91..e8b0bc58 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -256,4 +256,8 @@ #define inline __inline #endif +#ifdef DBUS_WIN +#define FD_SETSIZE @FD_SETSIZE@ +#endif + #endif // _DBUS_CONFIG_H diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 5e81e7f9..54a920f8 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -1,3 +1,4 @@ +include_directories(${CMAKE_SOURCE_DIR}/../test) add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS}) @@ -73,7 +74,6 @@ if(DBUS_WITH_GLIB) include_directories( ${GLIB2_INCLUDE_DIR} ${GOBJECT_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/../test ) set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES}) |