diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-08 11:43:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-08 11:45:13 (GMT) |
| commit | c756fbce9ba94e2d7f1b787d595df24dbe99c9c1 (patch) | |
| tree | c33d897d80d3623677d90f40d9cba5ae9474b96f /Source/cmCoreTryCompile.cxx | |
| parent | 99ce35ab9cbdac4a7cc626590f5e86c36ae29070 (diff) | |
| parent | a1e6b414b9ade99a8f4e6bbe9bbff43ee1a05e88 (diff) | |
| download | CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.zip CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.tar.gz CMake-c756fbce9ba94e2d7f1b787d595df24dbe99c9c1.tar.bz2 | |
Merge topic 'ghs_os_dir'
a1e6b414b9 GHS: Update GHS_BSP_NAME processing
266dadf868 GHS: Print status message regarding GHS_OS_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3123
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 ffc41ba..dcb1ff5 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, @@ -896,7 +897,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)); } } |