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

CMake: Fix incorrect paths in build instructions message

Browse Source 
When doing a top-level build,
QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX is not set in the
top-level scope. There's no point really in using the relocatable
path anyway, given this will only be displayed once when either
configuring qtbase or qt6.

Just use CMAKE_INSTALL_PREFIX directly.

Change-Id: Idb7e1953745f55048c42155868c2dd9384876c7c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-10 14:43:37 +02:00
parent 1e1e6e288a
commit b73809f30c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtBuildInformation.cmake
View File

@ -21,17 +21,17 @@ 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 .")
message("Qt is now configured for building. Just run '${build_command}'.") message("Qt is now configured for building. Just run '${build_command}'")
if(QT_WILL_INSTALL) if(QT_WILL_INSTALL)
message("Once everything is built, you must run '${install_command}'.") message("Once everything is built, you must run '${install_command}'")
message("Qt will be installed into '${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}'") message("Qt will be installed into '${CMAKE_INSTALL_PREFIX}'")
else() else()
message("Once everything is built, Qt is installed.") message("Once everything is built, Qt is installed.")
message("You should NOT run '${install_command}'") message("You should NOT run '${install_command}'")
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("To configure and build other modules, you can use the following convenience script: message("To configure and build other modules, you can use the following convenience script:
${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qt-cmake") ${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qt-cmake")
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()