summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-29 17:11:03 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-30 13:15:14 +0200
commite932a898a5642316fcbe98257405bf7ff0de2a7b (patch)
tree265f6704a666525e730d9eb1b2de67a283342b8a /cmake
parent108fb2f1973f1919a4dece8c0b1624923aedd8af (diff)
CMake: Adjust some status messages about syncqt and file generation
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>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake1
-rw-r--r--cmake/QtFeature.cmake1
-rw-r--r--cmake/QtPostProcess.cmake3
3 files changed, 1 insertions, 4 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 9656fa293a..48bcad52c5 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2679,6 +2679,7 @@ function(qt_add_module target)
-outdir "${QT_BUILD_DIR}"
-builddir "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}")
+ message(STATUS "Running syncqt for module: '${module_include_name}' ")
execute_process(COMMAND ${syncqt_full_command})
set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_HAS_HEADERS ON)
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index bdbdae9611..870ae0d194 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -424,7 +424,6 @@ function(qt_internal_generate_feature_line line feature)
endfunction()
function(qt_internal_feature_write_file file features extra)
- message("Generating file ${file}.")
set(contents "")
foreach(it ${features})
qt_internal_generate_feature_line(line "${it}")
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
index a7b56d2e26..73d9d2dcd6 100644
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@@ -1,6 +1,5 @@
function(qt_internal_write_depends_file module)
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")
string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")
foreach (m ${ARGN})
@@ -256,12 +255,10 @@ endfunction()
function(qt_internal_create_depends_files)
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})
qt_internal_create_module_depends_file(${target})
endforeach()
- message("Generating CMake PluginDependencies files for ${QT_KNOWN_PLUGINS}...")
foreach (target ${QT_KNOWN_PLUGINS})
qt_internal_create_plugin_depends_file(${target})
endforeach()