diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-10 14:43:37 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-11 15:52:25 +0200 |
| commit | b73809f30ce3bbb825162cde8d4384c4becd3686 (patch) | |
| tree | 5d520db093bd0dee7bee9c46ec803b583765ad7c /cmake/QtBuildInformation.cmake | |
| parent | 1e1e6e288a04091c70c94f88b492115ffcb4a828 (diff) | |
CMake: Fix incorrect paths in build instructions message
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>
Diffstat (limited to 'cmake/QtBuildInformation.cmake')
| -rw-r--r-- | cmake/QtBuildInformation.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index 784c79a8b0..56df1d4f0c 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -21,17 +21,17 @@ function(qt_print_build_instructions) set(build_command "cmake --build . --parallel") 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) - message("Once everything is built, you must run '${install_command}'.") - message("Qt will be installed into '${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}'") + message("Once everything is built, you must run '${install_command}'") + message("Qt will be installed into '${CMAKE_INSTALL_PREFIX}'") else() message("Once everything is built, Qt is installed.") message("You should NOT run '${install_command}'") message("Note that this build cannot be deployed to other machines or devices.") endif() 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' \ from the build directory \n") endfunction() |