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

CMake: Advertise qt-configure-module in configure output

Browse Source 
...instead of qt-cmake-private.
Also, add ".bat" on Windows.

Change-Id: I2aa94ac76f2dadfb8e94d68b19bb379b3d45a93d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-10-21 11:39:45 +02:00
parent 90e384d286
commit 4b016c87c1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtBuildInformation.cmake
View File

@ -20,6 +20,10 @@ function(qt_print_build_instructions)
set(build_command "cmake --build . --parallel") set(build_command "cmake --build . --parallel")
set(install_command "cmake --install .") set(install_command "cmake --install .")
set(configure_module_command "qt-configure-module")
if(CMAKE_HOST_WIN32)
string(APPEND configure_module_command ".bat")
endif()
message("Qt is now configured for building. Just run '${build_command}'\n") message("Qt is now configured for building. Just run '${build_command}'\n")
if(QT_WILL_INSTALL) if(QT_WILL_INSTALL)
@ -30,7 +34,7 @@ function(qt_print_build_instructions)
message("Note that this build cannot be deployed to other machines or devices.") message("Note that this build cannot be deployed to other machines or devices.")
endif() endif()
message("\nTo configure and build other Qt modules, you can use the following convenience script: message("\nTo configure and build other Qt modules, you can use the following convenience script:
${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake-private") ${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/${configure_module_command}")
message("\nIf reconfiguration fails for some reason, try to remove 'CMakeCache.txt' \ message("\nIf reconfiguration fails for some reason, try to remove 'CMakeCache.txt' \
from the build directory \n") from the build directory \n")
endfunction() endfunction()