Differential D7352 Diff 18665 cmake/modules/TpQtMacros.cmake

Changeset View

Standalone View

View Options

cmake/modules/TpQtMacros.cmake

Show First 20 Lines • Show All 172 Lines • ▼ Show 20 Line(s)142FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_options)
173 add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile}) 173​ add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile})
174 add_dependencies(moc-${_moc_outfile_name} ${ARGN}) 174​ add_dependencies(moc-${_moc_outfile_name} ${ARGN})
175ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS) 175​ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS)
176 176​
177# add the -i option to QT_GENERATE_MOC 177​# add the -i option to QT_GENERATE_MOC
178function(TPQT_GENERATE_MOC_I infile outfile) 178​function(TPQT_GENERATE_MOC_I infile outfile)
179 qt5_get_moc_flags(moc_flags) 179​ qt5_get_moc_flags(moc_flags)
180 get_filename_component(abs_infile ${infile} ABSOLUTE) 180​ get_filename_component(abs_infile ${infile} ABSOLUTE)
181 qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i") 181​ qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
davidedmundsonUnsubmitted
Done

why this change?

given we're still using qt5_get_moc_flags above?

davidedmundson: why this change? given we're still using qt5_get_moc_flags above?
akulichalexandrUnsubmitted
Done

Probably: https://github.com/TelepathyIM/telepathy-qt/commit/8bc552180387d5b913e5852721b7e172e8b5237a#diff-5abaf37a506a4f483cc6e57d169b23aeR86

akulichalexandr: Probably: https://github.com/TelepathyIM/telepathy…
akulichalexandrUnsubmitted
Done

I misread your comment.
Your point is absolutely valid — qt5_* -> qt_ macro renaming should go to an another commit.

akulichalexandr: I misread your comment. Your point is absolutely valid — qt5_* -> qt_ macro renaming should go…
heikobeckerAuthorUnsubmitted
Done

Upstream t-l-qt differ there and I accidentally included it. It was renamed from 'qt' to 'qt5' in t-l-q with commit: 594d2c32c1bd088e98f32a4b88500b5f4ffdc7e1

heikobecker: Upstream t-l-qt differ there and I accidentally included it. It was renamed from 'qt' to 'qt5'…
182 set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file 182​ set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
183endfunction(TPQT_GENERATE_MOC_I) 183​endfunction(TPQT_GENERATE_MOC_I)
184 184​
185# same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on 185​# same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on
186function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile) 186​function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile)
187 qt5_get_moc_flags(moc_flags) 187​ qt5_get_moc_flags(moc_flags)
188 get_filename_component(abs_infile ${infile} ABSOLUTE) 188​ get_filename_component(abs_infile ${infile} ABSOLUTE)
189 tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN}) 189​ tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN})
Show All 28 Lines206 ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
218 --visibility=TP_QT_EXPORT 218​ --visibility=TP_QT_EXPORT
219 ${client_generator_args}) 219​ ${client_generator_args})
220 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp 220​ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp
221 COMMAND ${PYTHON_EXECUTABLE} 221​ COMMAND ${PYTHON_EXECUTABLE}
222 ARGS ${ARGS} 222​ ARGS ${ARGS}
223 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 223​ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
224 224​
225 DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py 225​ 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)
227 add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp) 229​ add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
228 add_dependencies(all-generated-sources generate_cli-${spec}-body) 230​ add_dependencies(all-generated-sources generate_cli-${spec}-body)
229 231​
230 if (client_generator_depends) 232​ if (client_generator_depends)
231 add_dependencies(generate_cli-${spec}-body ${client_generator_depends}) 233​ add_dependencies(generate_cli-${spec}-body ${client_generator_depends})
232 endif (client_generator_depends) 234​ endif (client_generator_depends)
233 235​
234 tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h 236​ tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
Show All 19 Lines244 ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
254 --visibility=TP_QT_NO_EXPORT 256​ --visibility=TP_QT_NO_EXPORT
255 ${future_client_generator_args}) 257​ ${future_client_generator_args})
256 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp 258​ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp
257 COMMAND ${PYTHON_EXECUTABLE} 259​ COMMAND ${PYTHON_EXECUTABLE}
258 ARGS ${ARGS} 260​ ARGS ${ARGS}
259 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 261​ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
260 262​
261 DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py 263​ 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)
263 add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp) 267​ add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
264 add_dependencies(all-generated-sources generate_future-${spec}-body) 268​ add_dependencies(all-generated-sources generate_future-${spec}-body)
265 269​
266 if (future_client_generator_depends) 270​ if (future_client_generator_depends)
267 add_dependencies(generate_future-${spec}-body ${future_client_generator_depends}) 271​ add_dependencies(generate_future-${spec}-body ${future_client_generator_depends})
268 endif (future_client_generator_depends) 272​ endif (future_client_generator_depends)
269 273​
270 tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h 274​ tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
Show All 18 Lines283 ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py
289 --visibility=TP_QT_EXPORT 293​ --visibility=TP_QT_EXPORT
290 ${service_generator_args}) 294​ ${service_generator_args})
291 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp 295​ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp
292 COMMAND ${PYTHON_EXECUTABLE} 296​ COMMAND ${PYTHON_EXECUTABLE}
293 ARGS ${ARGS} 297​ ARGS ${ARGS}
294 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 298​ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
295 299​
296 DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py 300​ 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)
298 add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp) 304​ add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
299 add_dependencies(all-generated-service-sources generate_service-${spec}-body) 305​ add_dependencies(all-generated-service-sources generate_service-${spec}-body)
300 306​
301 if (service_generator_depends) 307​ if (service_generator_depends)
302 add_dependencies(generate_service-${spec}-body ${service_generator_depends}) 308​ add_dependencies(generate_service-${spec}-body ${service_generator_depends})
303 endif (service_generator_depends) 309​ endif (service_generator_depends)
304 310​
305 tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h 311​ tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h
▲ Show 20 Lines • Show All 188 Lines • Show Last 20 Lines