CMake: Utilize CMAKE_VERBOSE_MAKEFILE setting of CMake

Define CMAKE_VERBOSE_MAKEFILE also affects ninja generator
by adding -v if called through cmake interface ie.
'cmake --build .'

Kitware/CMake@ce935eb

Use the value of CMAKE_VERBOSE_MAKEFILE to determine if
gn or chromium part must be built verbosely, in which case
append -v to the invocation of ninja.

Unify ninja flags setup for gn and chromium part compile calls,
so now NINJAFLAGS environment variable applies when building
gn itself.

Note this change has side effect compared to cmake patch
meaning the verbose mode is applied also when calling ninja directly.

Done-With: Fab Stz <[email protected]>
Pick-to: 6.9 6.8
Fixes: QTBUG-124007
Change-Id: Id30ffc45ffa8ea4b7995d13905c855cbb4bf6407
Reviewed-by: Alexey Edelev <[email protected]>

Author: Michal Klocek

cmake/Functions.cmake

@@ -308,7 +308,10 @@ function(add_ninja_command)
     )
     _qt_internal_validate_all_args_are_parsed(arg)
 
-    string(REPLACE " " ";" NINJAFLAGS "$ENV{NINJAFLAGS}")
+    string(REPLACE " " ";" ninja_flags "$ENV{NINJAFLAGS}")
+    if(CMAKE_VERBOSE_MAKEFILE)
+        list(APPEND ninja_flags -v)
+    endif()
     list(TRANSFORM arg_OUTPUT PREPEND "${arg_BUILDDIR}/")
     list(TRANSFORM arg_BYPRODUCTS PREPEND "${arg_BUILDDIR}/")
     add_custom_command(
@@ -318,7 +321,7 @@ function(add_ninja_command)
         BYPRODUCTS ${arg_BYPRODUCTS}
         COMMENT "Running ninja for ${arg_TARGET} in ${arg_BUILDDIR}"
         COMMAND Ninja::ninja
-            ${NINJAFLAGS}
+            ${ninja_flags}
             -C ${arg_BUILDDIR}
             ${arg_TARGET}
         USES_TERMINAL
@@ -541,6 +544,7 @@ macro(qt_webengine_externalproject_add)
                    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                    -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
                    -DCMAKE_OSX_ARCHITECTURES=${OSX_ARCH_STR}
+                   -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
                    -DWEBENGINE_ROOT_BUILD_DIR=${PROJECT_BINARY_DIR}
                    -DQT_ALLOW_SYMLINK_IN_PATHS=${QT_ALLOW_SYMLINK_IN_PATHS}
                    -DPython3_EXECUTABLE=${Python3_EXECUTABLE}

src/gn/CMakeLists.txt

@@ -59,6 +59,11 @@ if(GCC_LEGACY_SUPPORT)
     set(GN_GCC_LEGACY_SUPPORT --gcc-legacy-support)
 endif()
 
+string(REPLACE " " ";" ninja_flags "$ENV{NINJAFLAGS}")
+if(CMAKE_VERBOSE_MAKEFILE)
+    list(APPEND ninja_flags -v)
+endif()
+
 list(JOIN CMAKE_OSX_ARCHITECTURES "$<COMMA>" OSX_ARCH)
 add_custom_command(
     OUTPUT ${GN_EXECUTABLE}
@@ -79,7 +84,7 @@ add_custom_command(
         $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:--osx-architectures>
         $<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:${OSX_ARCH}>
         ${GN_GCC_LEGACY_SUPPORT}
-    COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
+    COMMAND Ninja::ninja ${ninja_flags} -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
     VERBATIM
     USES_TERMINAL
     COMMAND_EXPAND_LISTS