528e8af19f
Delay use of CMAKE_GENERATOR_TOOLSET until the CMakeSystem.cmake file has been configured and loaded during the first project() or enable_language() command. This gives the toolchain file named by CMAKE_TOOLCHAIN_FILE a chance to set CMAKE_GENERATOR_TOOLSET. This point is still early enough to set the generator toolset prior to the initialization of any languages that might use the toolset. The cmake::GeneratorToolset member variable remains an indication of what was specified by the -T option or loaded from the cache. It does not need to be updated based on the toolchain file setting. The cmMakefile::TryCompile can still pass cmake::GeneratorToolset into the inner instance because the try-compiled project will do platform and language initialization using the CMakeSystem module configured for the outer project. Extend the RunCMake.GeneratorToolset test with cases that use a toolchain file to set CMAKE_GENERATOR_TOOLSET. |
||
|---|---|---|
| .. | ||
| BadToolset-result.txt | ||
| BadToolset-stderr.txt | ||
| BadToolset-toolchain.cmake | ||
| BadToolset.cmake | ||
| BadToolsetToolchain-result.txt | ||
| BadToolsetToolchain-stderr.txt | ||
| BadToolsetToolchain.cmake | ||
| CMakeLists.txt | ||
| NoToolset-result.txt | ||
| NoToolset-stderr.txt | ||
| NoToolset.cmake | ||
| RunCMakeTest.cmake | ||
| TestToolset-result.txt | ||
| TestToolset-stderr.txt | ||
| TestToolset-toolchain.cmake | ||
| TestToolset.cmake | ||
| TestToolsetToolchain-result.txt | ||
| TestToolsetToolchain-stderr.txt | ||
| TestToolsetToolchain.cmake | ||
| TwoToolsets-result.txt | ||
| TwoToolsets-stderr.txt | ||
| TwoToolsets.cmake | ||