kdesupport/qt-dbus/examples

Peter Kümmel syntheticpp at yahoo.com
Wed May 31 21:36:06 CEST 2006


SVN commit 547079 by kuemmel:

build example/chat also on windows: fix dbusidl2cpp.exe usage with nmake. 
using the IDE is still broken because chatinterface.moc and chatmainwindow.h are not generated.
this is baybe a cmake BUG.

CCMAIL:kde-buildsystem at kde.org



 M  +10 -3     CMakeLists.txt  


--- trunk/kdesupport/qt-dbus/examples/CMakeLists.txt #547078:547079
@@ -66,7 +66,6 @@
 
 ########### next target ###############
 
-if(NOT WIN32)
 
 SET(chat_SRCS
 	chat.cpp
@@ -81,8 +80,17 @@
 		   COMMAND ${QT_UIC_EXECUTABLE}
 		   ARGS -o chatsetnickname.h ${CMAKE_CURRENT_SOURCE_DIR}/chatsetnickname.ui
 		   DEPENDS chatsetnickname.ui)
+if(WIN32)
+	if(NOT MSVC_IDE)
+		set(DBUSIDL2CPP_PROGRAM ${CMAKE_BINARY_DIR}/tools/dbusidl2cpp.exe)
+	else(NOT MSVC_IDE)
+		set(DBUSIDL2CPP_PROGRAM ${CMAKE_BINARY_DIR}/tools/$(OutDir)/dbusidl2cpp.exe)
+	endif(NOT MSVC_IDE)
+else(WIN32)
+	set(DBUSIDL2CPP_PROGRAM ${CMAKE_CURRENT_BINARY_DIR}/../tools/dbusidl2cpp)
+endif(WIN32)
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chatinterface.cpp ${CMAKE_CURRENT_BINARY_DIR}/chatinterface.h
-		   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../tools/dbusidl2cpp
+		   COMMAND ${DBUSIDL2CPP_PROGRAM}
 		   ARGS -m -p chatinterface ${CMAKE_CURRENT_SOURCE_DIR}/com.trolltech.ChatInterface.xml
 		   DEPENDS com.trolltech.ChatInterface.xml dbusidl2cpp)
 ADD_CUSTOM_COMMAND(OUTPUT chatinterface.moc
@@ -95,6 +103,5 @@
 ADD_EXECUTABLE(chat ${chat_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/chatinterface.cpp)
 TARGET_LINK_LIBRARIES(chat dbus-qt4-1 ${QTGUI})
 
-endif(NOT WIN32)
 
 ########### install files ###############


More information about the Kde-buildsystem mailing list