From: Frank Osterfeld <frank@kdab.net>
Date: Tue, 28 Apr 2009 14:45:03 +0000 (+0100)
Subject: disable launch-helper on windows for now until it builds (cherry picked from commit... 
X-Git-Tag: dbus-1.3.1~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c263a6dfff556ead2f434670ba08bae7b92d5aa1;p=thirdparty%2Fdbus.git

disable launch-helper on windows for now until it builds (cherry picked from commit 48da3a0450172f711c25a459ce70c2521d22ee27)
---

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index eb48e7248..059b84170 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -160,17 +160,21 @@ set(LAUNCH_HELPER_SOURCES ${XML_SOURCES}
 
 )
 
-add_executable(dbus-daemon-launch-helper ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/activation-helper-bin.c )
-target_link_libraries(dbus-daemon-launch-helper ${DBUS_1} ${LIBS} )
-
-add_executable(dbus-daemon-launch-helper-test ${LAUNCH_HELPER_SOURCES}     ${BUS_DIR}/activation-helper-bin.c)
-set_target_properties(dbus-daemon-launch-helper-test PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST")
-target_link_libraries(dbus-daemon-launch-helper-test ${DBUS_1} ${LIBS} )
-
-add_executable(bus-test-launch-helper ${LAUNCH_HELPER_SOURCES}  ${BUS_DIR}/test-launch-helper.c)
-set_target_properties(bus-test-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
-target_link_libraries(bus-test-launch-helper ${DBUS_1} ${LIBS} )
-add_test(bus-test-launch-helper ${EXECUTABLE_OUTPUT_PATH}/bus-test-launch-helper )
+if(NOT WIN32)
+# TODO PENDING(kdab) fix build on windows (activation-helper.c)
+   add_executable(dbus-daemon-launch-helper ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/activation-helper-bin.c )
+   target_link_libraries(dbus-daemon-launch-helper ${DBUS_1} ${LIBS} )
+   
+   add_executable(dbus-daemon-launch-helper-test ${LAUNCH_HELPER_SOURCES}     ${BUS_DIR}/activation-helper-bin.c)
+   set_target_properties(dbus-daemon-launch-helper-test PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST")
+   target_link_libraries(dbus-daemon-launch-helper-test ${DBUS_1} ${LIBS} )
+   
+   add_executable(bus-test-launch-helper ${LAUNCH_HELPER_SOURCES}  ${BUS_DIR}/test-launch-helper.c)
+   set_target_properties(bus-test-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
+   target_link_libraries(bus-test-launch-helper ${DBUS_1} ${LIBS} )
+   add_test(bus-test-launch-helper ${EXECUTABLE_OUTPUT_PATH}/bus-test-launch-helper )
+
+endif(NOT WIN32)
 
 #### Init scripts fun
 #SCRIPT_IN_FILES=messagebus.in