SVN commit 1112564 by rdale: * Fix build problems caused by smoke/kde/config.xml.cmake no longer being present CCMAIL: kde-bindings@kde.org M +3 -2 akonadi/CMakeLists.txt A akonadi/config.xml.cmake M +2 -2 khtml/CMakeLists.txt A khtml/config.xml.cmake M +2 -2 ktexteditor/CMakeLists.txt A ktexteditor/config.xml.cmake M +2 -2 nepomuk/CMakeLists.txt A nepomuk/config.xml.cmake M +1 -1 nepomukquery/CMakeLists.txt M +2 -2 okular/CMakeLists.txt A okular/config.xml.cmake M +2 -2 plasma/CMakeLists.txt A plasma/config.xml.cmake M +2 -2 solid/CMakeLists.txt A solid/config.xml.cmake M +2 -2 soprano/CMakeLists.txt A soprano/config.xml.cmake M +1 -1 sopranoclient/CMakeLists.txt M +1 -1 sopranoserver/CMakeLists.txt --- trunk/KDE/kdebindings/smoke/akonadi/CMakeLists.txt #1112563:1112564 @@ -3,7 +3,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp @@ -17,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -I "${AKONADI_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/akonadi_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/khtml/CMakeLists.txt #1112563:1112564 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -26,7 +26,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/khtml_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/ktexteditor/CMakeLists.txt #1112563:1112564 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -16,7 +16,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/ktexteditor_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/nepomuk/CMakeLists.txt #1112563:1112564 @@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_QUERY_INCLUDE_DIR} ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -22,7 +22,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomuk_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/nepomukquery/CMakeLists.txt #1112563:1112564 @@ -13,7 +13,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../nepomuk/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomukquery_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/okular/CMakeLists.txt #1112563:1112564 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -16,7 +16,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/okular_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/plasma/CMakeLists.txt #1112563:1112564 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -16,7 +16,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/plasma_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/solid/CMakeLists.txt #1112563:1112564 @@ -1,7 +1,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/smoke ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -16,7 +16,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -- ${CMAKE_CURRENT_SOURCE_DIR}/solid_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/soprano/CMakeLists.txt #1112563:1112564 @@ -3,7 +3,7 @@ include_directories( ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR} ) -########### next target ############### +configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp @@ -18,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/sopranoclient/CMakeLists.txt #1112563:1112564 @@ -9,7 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../soprano/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) --- trunk/KDE/kdebindings/smoke/sopranoserver/CMakeLists.txt #1112563:1112564 @@ -9,7 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp COMMAND smokegen - ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../soprano/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})