X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmake%2FCMakeLists.txt;h=9db47381f68ff377e8bb1ed1d3537d503908482b;hb=797b511deb3b63474a1c2eae7cabbb00127fb6bb;hp=10fc0ee81fe0596b9294e0348ffd03109cc088c6;hpb=2f2618294d342e72ffd791289e565782413fac67;p=platform%2Fupstream%2Fdbus.git

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 10fc0ee..9db4738 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -358,8 +358,8 @@ endif(X11_FOUND)
 
 # test binary names
 if (WIN32)
-	set (EXT ".exe")
-	# compatible with Automake .in files
+	# Automake calls this EXEEXT, and CMake doesn't have a standard name
+	# for it; follow Automake's naming convention so we can share .in files
 	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_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)
-        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)