diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-03-20 00:56:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-29 16:38:12 (GMT) |
| commit | 266dadf8683c9c0081368604c4ccae12e8ffc9f7 (patch) | |
| tree | 8f31f9da6d5ea106b09367c34c178462f47ef330 /Source/cmCoreTryCompile.cxx | |
| parent | 89abbdd8c8db5bf587373f2a00f6a816eddd8496 (diff) | |
| download | CMake-266dadf8683c9c0081368604c4ccae12e8ffc9f7.zip CMake-266dadf8683c9c0081368604c4ccae12e8ffc9f7.tar.gz CMake-266dadf8683c9c0081368604c4ccae12e8ffc9f7.tar.bz2 | |
GHS: Print status message regarding GHS_OS_DIR
-- Rename platform script so it runs before initial try_compile() in
project() command.
-- Fix incorrect variable name GHS_OS_DIR_OPTION
-- Remove unnecessary ".*" from REGEX expression for GHS_CANDIDATE_OS_DIRS
-- Forward GHS_OS_DIR_OPTION to try_compile() and preserve trailing
whitespace of the variable.
Diffstat (limited to 'Source/cmCoreTryCompile.cxx')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 69d4374..62fba74 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -60,7 +60,8 @@ static std::string const kCMAKE_WARN_DEPRECATED = "CMAKE_WARN_DEPRECATED"; /* GHS Multi platform variables */ static std::set<std::string> ghs_platform_vars{ "GHS_TARGET_PLATFORM", "GHS_PRIMARY_TARGET", "GHS_TOOLSET_ROOT", - "GHS_OS_ROOT", "GHS_OS_DIR", "GHS_BSP_NAME" + "GHS_OS_ROOT", "GHS_OS_DIR", "GHS_BSP_NAME", + "GHS_OS_DIR_OPTION" }; static void writeProperty(FILE* fout, std::string const& targetName, @@ -881,7 +882,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, // Forward the GHS variables to the inner project cache. for (std::string const& var : ghs_platform_vars) { if (const char* val = this->Makefile->GetDefinition(var)) { - std::string flag = "-D" + var + "=" + val; + std::string flag = "-D" + var + "=" + "'" + val + "'"; cmakeFlags.push_back(std::move(flag)); } } |