On 07/27/2012 09:22 PM, David C. Rankin wrote:

Slavek,

There are a couple of useful CMake commits that need to be cherrypicked for 3.5.13-sru. The first is in tdebase:

tdebase/kioslave/media/mediamanager/CMakeLists.txt

include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${HAL_INCLUDE_DIRS}

• ${DBUS_TQT_INCLUDE_DIRS}

)

There is a commit that adds ${DBUS_TQT_INCLUDE_DIRS} to the include_directories list. I'll keep a list in this thread and we can look up the commit numbers when we are done.

Slavek,

This is the commit that needs to be put in v3.5.13-sru:

http://git.trinitydesktop.org/cgit/tdebase/commit/?id=9cccdc10f74a56550470cd...

I don't know how to tag/pick/whatever to make this part of v3.5.13-sru (it took me long enough to find it). I'll leave making this part of v3.5.13-sru to you or Tim. (or if you give me a cheat-sheet on how to do it and a 'sign off', I don't mind learning)