diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-09 18:08:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-09 18:21:54 (GMT) |
| commit | 53e89b6ab0cae7b9ba0316b3806abd986794a22c (patch) | |
| tree | 45529a1a882e354379d151e88132be00a7286c99 /Source/cmLocalNinjaGenerator.cxx | |
| parent | b69e061b8073efbd2c356f4508ea401c85e8dae3 (diff) | |
| download | CMake-53e89b6ab0cae7b9ba0316b3806abd986794a22c.zip CMake-53e89b6ab0cae7b9ba0316b3806abd986794a22c.tar.gz CMake-53e89b6ab0cae7b9ba0316b3806abd986794a22c.tar.bz2 | |
Add options for separate compile and link sysroots
Add `CMAKE_SYSROOT_COMPILE` and `CMAKE_SYSROOT_LINK` variables to as
operation-specific alternatives to `CMAKE_SYSROOT`. This will be useful
for Android NDKs that compile and link with different sysroot values
(e.g. `r14` with unified headers).
Co-Author: Florent Castelli <florent.castelli@gmail.com>
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index e0e3e54..35960d4 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -37,8 +37,9 @@ cmLocalNinjaGenerator::cmLocalNinjaGenerator(cmGlobalGenerator* gg, cmRulePlaceholderExpander* cmLocalNinjaGenerator::CreateRulePlaceholderExpander() const { - cmRulePlaceholderExpander* ret = new cmRulePlaceholderExpander( - this->Compilers, this->VariableMappings, this->CompilerSysroot); + cmRulePlaceholderExpander* ret = + new cmRulePlaceholderExpander(this->Compilers, this->VariableMappings, + this->CompilerSysroot, this->LinkerSysroot); ret->SetTargetImpLib("$TARGET_IMPLIB"); return ret; } |