Skip to content

Commit d9354df

Browse files
committed
CMake/TpQtMacros: Added missing dependencies.
Generated header now depends on input xmls. Fixes build with ninja.
1 parent ed44e19 commit d9354df

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

cmake/modules/TpQtMacros.cmake

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ function(tpqt_client_generator spec group pretty_include namespace)
223223
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
224224

225225
DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
226-
${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
226+
${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
227+
${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
228+
${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml)
227229
add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
228230
add_dependencies(all-generated-sources generate_cli-${spec}-body)
229231

@@ -259,7 +261,9 @@ function(tpqt_future_client_generator spec namespace)
259261
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
260262

261263
DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
262-
${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
264+
${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
265+
${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml
266+
${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml)
263267
add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
264268
add_dependencies(all-generated-sources generate_future-${spec}-body)
265269

@@ -294,7 +298,9 @@ function(tpqt_service_generator spec group pretty_include namespace)
294298
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
295299

296300
DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
297-
${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py)
301+
${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py
302+
${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
303+
${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml)
298304
add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
299305
add_dependencies(all-generated-service-sources generate_service-${spec}-body)
300306

0 commit comments

Comments
 (0)