diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-08 09:30:11 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-22 18:32:47 +0200 |
commit | fb9cc529201dab24f864ede3e15114845aad0cdb (patch) | |
tree | 25121ba6e2e6191cce9b878cbb5dcf042a919587 /cmake/QtSetup.cmake | |
parent | a36a795770d4c4cbab610c5721140023e02b1737 (diff) |
Rework how installation is prevented in non-prefix builds
In non-prefix builds, we want to prevent users from accidentally running
"cmake --install". We did that by replacing cmake_install.cmake with an
empty file.
The responsible target remove_cmake_install is visible in IDEs, appears
in the build output, and the approach is hacky.
It's cleaner and easier to add bail out code at the top of
cmake_install.cmake. This is now done when calling qt_build_repo_begin.
As a bonus, print an informative message on installation.
Change-Id: I022b36289358ba09cac8b79781f44cd7b93113f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtSetup.cmake')
-rw-r--r-- | cmake/QtSetup.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 4fa305431d..5447f1087a 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -225,9 +225,6 @@ include(QtCompilerOptimization) ## Compiler flags: include(QtCompilerFlags) -## Set up non-prefix build: -qt_set_up_nonprefix_build() - qt_set_language_standards() option(QT_USE_CCACHE "Enable the use of ccache") |