diff options
| author | Simon McVittie <smcv@debian.org> | 2015-02-04 20:14:36 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2015-02-04 20:14:36 +0000 |
| commit | 08e702f5a938b7ec81044f599f03de0a3ad3fce8 (patch) | |
| tree | e1720ac81a56f8994f99ff7b57b18ce9d2f7458c /cmake | |
| parent | 9f7037805b3f6564710f92d8be80f1953b544884 (diff) | |
| download | dbus-08e702f5a938b7ec81044f599f03de0a3ad3fce8.tar.gz | |
Imported Upstream version 1.8.16upstream/1.8.16upstream
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 eaec1e98..729080f7 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -248,4 +248,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 9195eae7..ecad3046 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}) @@ -66,7 +67,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}) |