SVN commit 547552 by dfaure:
Every call to "make" would re-generate the same files, because it thought they
were going to the srcdir
instead of the builddir. I think this makes the msvc hack unnecessary now,
please check.
CCMAIL: [email protected]
M +4 -4 CMakeLists.txt
--- trunk/kdesupport/qt-dbus/examples/CMakeLists.txt #547551:547552
@@ -72,11 +72,11 @@
chat.h
chatadaptor.cpp
)
-ADD_CUSTOM_COMMAND(OUTPUT chatmainwindow.h
+ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chatmainwindow.h
COMMAND ${QT_UIC_EXECUTABLE}
ARGS -o chatmainwindow.h
${CMAKE_CURRENT_SOURCE_DIR}/chatmainwindow.ui
DEPENDS chatmainwindow.ui)
-ADD_CUSTOM_COMMAND(OUTPUT chatsetnickname.h
+ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chatsetnickname.h
COMMAND ${QT_UIC_EXECUTABLE}
ARGS -o chatsetnickname.h
${CMAKE_CURRENT_SOURCE_DIR}/chatsetnickname.ui
DEPENDS chatsetnickname.ui)
@@ -84,7 +84,7 @@
if(MSVC_IDE)
set(DBUSIDL2CPP_PROGRAM
${CMAKE_BINARY_DIR}/tools/$(OutDir)/dbusidl2cpp.exe)
# add this files to chat_SRCS when there are problems with
other generators
- set(chat_SRCS ${chat_SRCS} chatmainwindow.h chatsetnickname.h
chatinterface.moc )
+ #set(chat_SRCS ${chat_SRCS} chatmainwindow.h chatsetnickname.h
chatinterface.moc )
else(MSVC_IDE)
set(DBUSIDL2CPP_PROGRAM ${CMAKE_BINARY_DIR}/bin/dbusidl2cpp.exe)
endif(MSVC_IDE)
@@ -95,7 +95,7 @@
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
+ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/chatinterface.moc
COMMAND ${QT_MOC_EXECUTABLE}
ARGS -o chatinterface.moc chatinterface.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/chatinterface.cpp)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
