[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qt-dbus
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-06-06 20:27:53
Message-ID: 1149625673.576417.25182.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 548900 by neundorf:

-force CMAKE_SKIP_RPATH to FALSE so that it works on Gentoo
-add some whitespace

Alex


 M  +2 -0      CMakeLists.txt  
 M  +5 -0      examples/CMakeLists.txt  


--- trunk/kdesupport/qt-dbus/CMakeLists.txt #548899:548900
@@ -4,6 +4,8 @@
 OPTION(QDBUS_NODEBUG "Disable debug mode")
 OPTION(QT_NO_DEBUG_OUTPUT "Suppress debugging output from Qt")
 
+
+set(CMAKE_SKIP_RPATH FALSE) # quick fix: on Gentoo CMAKE_SKIP_RPATH is set to TRUE \
by default, Alex  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(CMAKE_COLOR_MAKEFILE ON)
 
--- trunk/kdesupport/qt-dbus/examples/CMakeLists.txt #548899:548900
@@ -70,10 +70,12 @@
 		   COMMAND ${QT_UIC_EXECUTABLE}
 		   ARGS -o chatmainwindow.h ${CMAKE_CURRENT_SOURCE_DIR}/chatmainwindow.ui
 		   DEPENDS chatmainwindow.ui)
+
 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)
+
 if(WIN32)
 	if(MSVC_IDE)
 		set(DBUSIDL2CPP_PROGRAM ${CMAKE_BINARY_DIR}/tools/$(OutDir)/dbusidl2cpp.exe)
@@ -85,14 +87,17 @@
 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 ${DBUSIDL2CPP_PROGRAM}
 		   ARGS -m -p chatinterface \
${CMAKE_CURRENT_SOURCE_DIR}/com.trolltech.ChatInterface.xml  DEPENDS \
com.trolltech.ChatInterface.xml dbusidl2cpp) +
 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)
+
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/chatinterface.cpp GENERATED)
 
 QT4_AUTOMOC(${chat_SRCS})


[prev in list] [next in list] [prev in thread] [next in thread]