projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install empty session.d config directory using cmake, otherwise dbus-daemon will...
[platform/upstream/dbus.git]
/
cmake
/
CMakeLists.txt
diff --git
a/cmake/CMakeLists.txt
b/cmake/CMakeLists.txt
index
10fc0ee
..
9db4738
100644
(file)
--- a/
cmake/CMakeLists.txt
+++ b/
cmake/CMakeLists.txt
@@
-358,8
+358,8
@@
endif(X11_FOUND)
# test binary names
if (WIN32)
# test binary names
if (WIN32)
- set (EXT ".exe")
- #
compatible with Automak
e .in files
+ # Automake calls this EXEEXT, and CMake doesn't have a standard name
+ #
for it; follow Automake's naming convention so we can shar
e .in files
set (EXEEXT ".exe")
endif(WIN32)
set (EXEEXT ".exe")
endif(WIN32)
@@
-478,12
+478,10
@@
if (DBUS_BUILD_TESTS)
set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} )
set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test)
if (UNIX)
set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} )
set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test)
if (UNIX)
- set (TEST_LISTEN "debug-pipe:name=test-server</listen><listen>unix:tmpdir=${TEST_SOCKET_DIR}")
- set (TEST_CONNECTION "debug-pipe:name=test-server")
+ set (TEST_LISTEN "unix:tmpdir=${TEST_SOCKET_DIR}")
endif (UNIX)
if (WIN32)
endif (UNIX)
if (WIN32)
- set (TEST_LISTEN "tcp:host=localhost,port=12436")
- set (TEST_CONNECTION "${TEST_LISTEN}")
+ set (TEST_LISTEN "tcp:host=localhost")
endif (WIN32)
endif (DBUS_BUILD_TESTS)
endif (WIN32)
endif (DBUS_BUILD_TESTS)