1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Adjust some status messages about syncqt and file generation

Browse Source 
Show a status message when we run syncqt for a module (gives a bit
more insight into why the configuration seems to stall for a moment).

Remove some uninformative messages about generating config.h files
and Depends headers, etc.

Change-Id: I5ff2774b9cf5d92ddde564dc09f4197c2835ee4a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-29 17:11:03 +02:00
parent 108fb2f197
commit e932a898a5
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBuild.cmake
View File

@ -2679,6 +2679,7 @@ function(qt_add_module target)
-outdir "${QT_BUILD_DIR}" -outdir "${QT_BUILD_DIR}"
-builddir "${PROJECT_BINARY_DIR}" -builddir "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}") "${PROJECT_SOURCE_DIR}")
message(STATUS "Running syncqt for module: '${module_include_name}' ")
execute_process(COMMAND ${syncqt_full_command}) execute_process(COMMAND ${syncqt_full_command})
set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_HAS_HEADERS ON) set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_HAS_HEADERS ON)

1
cmake/QtFeature.cmake
View File

@ -424,7 +424,6 @@ function(qt_internal_generate_feature_line line feature)
endfunction() endfunction()
function(qt_internal_feature_write_file file features extra) function(qt_internal_feature_write_file file features extra)
message("Generating file ${file}.")
set(contents "") set(contents "")
foreach(it ${features}) foreach(it ${features})
qt_internal_generate_feature_line(line "${it}") qt_internal_generate_feature_line(line "${it}")

3
cmake/QtPostProcess.cmake
View File

@ -1,6 +1,5 @@
function(qt_internal_write_depends_file module) function(qt_internal_write_depends_file module)
set(outfile "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}/${module}Depends") set(outfile "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}/${module}Depends")
message("Generating ${outfile}...")
set(contents "/* This file was generated by cmake with the info from ${module} target. */\n") set(contents "/* This file was generated by cmake with the info from ${module} target. */\n")
string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n") string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")
foreach (m ${ARGN}) foreach (m ${ARGN})
@ -256,12 +255,10 @@ endfunction()
function(qt_internal_create_depends_files) function(qt_internal_create_depends_files)
qt_internal_get_qt_repo_known_modules(repo_known_modules) qt_internal_get_qt_repo_known_modules(repo_known_modules)
message("Generating ModuleDepends files and CMake ModuleDependencies files for ${repo_known_modules}...")
foreach (target ${repo_known_modules}) foreach (target ${repo_known_modules})
qt_internal_create_module_depends_file(${target}) qt_internal_create_module_depends_file(${target})
endforeach() endforeach()
message("Generating CMake PluginDependencies files for ${QT_KNOWN_PLUGINS}...")
foreach (target ${QT_KNOWN_PLUGINS}) foreach (target ${QT_KNOWN_PLUGINS})
qt_internal_create_plugin_depends_file(${target}) qt_internal_create_plugin_depends_file(${target})
endforeach() endforeach()