diff options
| author | Fred Baksik <fdk17@ftml.net> | 2021-11-15 18:15:10 (GMT) |
|---|---|---|
| committer | Fred Baksik <fdk17@ftml.net> | 2021-11-15 18:15:10 (GMT) |
| commit | 83eb5695e9540d18d7ff40a369763036813da79b (patch) | |
| tree | 75970779fe78d827dc7a5c672707adaef49cf5c9 /Source/cmGlobalGhsMultiGenerator.h | |
| parent | 8114ddcad1d274fd16ef6e1a74e5a0d083242018 (diff) | |
| download | CMake-83eb5695e9540d18d7ff40a369763036813da79b.zip CMake-83eb5695e9540d18d7ff40a369763036813da79b.tar.gz CMake-83eb5695e9540d18d7ff40a369763036813da79b.tar.bz2 | |
GHS: Update toolset selection logic
-- Ensure that GHS_TOOLSET_ROOT is used as a path
* Converts directory path slashes to CMake style
-- Use ComparePath() to properly check for path changes of build tool
* Accounts for Windows file-system case insensitivity.
-- Don't print message "defaulting" messages (this causes CMake test failures)
-- Don't force update CMAKE_GENERATOR_TOOLSET back into cache when `-T`
is not used on initial configure. This change avoids an unnessary
error message when accidentally using `-T` in subsequent runs but the same
tools are always used.
-- Use IssueMessage() for error messages.
Diffstat (limited to 'Source/cmGlobalGhsMultiGenerator.h')
| -rw-r--r-- | Source/cmGlobalGhsMultiGenerator.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index bd08301..935a878 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -114,7 +114,6 @@ private: std::string OsDir; static const char* DEFAULT_BUILD_PROGRAM; - static const char* DEFAULT_TOOLSET_ROOT; bool ComputeTargetBuildOrder(cmGeneratorTarget const* tgt, std::vector<cmGeneratorTarget const*>& build); |