diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-14 14:38:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-16 13:03:26 (GMT) |
| commit | 3144857e1eed83e038699942568869bfce461d4d (patch) | |
| tree | 308a88383bed0e65d0bae865ed84e8d1fdd5f092 /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | a87253154e15da3f05ec7a4c625caaa0c54a3861 (diff) | |
| download | CMake-3144857e1eed83e038699942568869bfce461d4d.zip CMake-3144857e1eed83e038699942568869bfce461d4d.tar.gz CMake-3144857e1eed83e038699942568869bfce461d4d.tar.bz2 | |
Avoid depending on CMAKE_ROOT cache entry internally (#16015)
Use cmSystemTools::GetCMakeRoot() which always knows the location of our
resources. Do not depend on CMAKE_ROOT because the user could unset it
from the cache.
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 08caea3..4cab81f 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -1003,8 +1003,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( SetupAutoRccTarget(target); } - const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT"); - std::string inputFile = cmakeRoot; + std::string inputFile = cmSystemTools::GetCMakeRoot(); inputFile += "/Modules/AutogenInfo.cmake.in"; std::string outputFile = targetDir; outputFile += "/AutogenInfo.cmake"; |