diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-22 15:15:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-22 15:15:41 (GMT) |
| commit | 41c17c1d2eadbcfa8ffc343dc197bd9d8522913c (patch) | |
| tree | 062b3dc9a2522240ca34889168d198ba91e5b3da /Source/cmGhsMultiTargetGenerator.cxx | |
| parent | 2f9e6551c02d0b189732c2a798f8b6aa4afa2313 (diff) | |
| parent | bf3e76d2146485e541ebeed891a8905946b96c9e (diff) | |
| download | CMake-41c17c1d2eadbcfa8ffc343dc197bd9d8522913c.zip CMake-41c17c1d2eadbcfa8ffc343dc197bd9d8522913c.tar.gz CMake-41c17c1d2eadbcfa8ffc343dc197bd9d8522913c.tar.bz2 | |
Merge topic 'ghs-try_compile'
bf3e76d2 GHS: Fix try_compile (#15975)
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.cxx')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 18e140e..c5813ba 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -217,8 +217,11 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY) { + std::string const static_library_suffix = + this->Makefile->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX"); *this->GetFolderBuildStreams() << " -o \"" - << outputDir << outputFilename << ".a\"" + << outputDir << outputFilename + << static_library_suffix << "\"" << std::endl; } else if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE) @@ -238,8 +241,11 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, } else { + std::string const executable_suffix = + this->Makefile->GetSafeDefinition("CMAKE_EXECUTABLE_SUFFIX"); *this->GetFolderBuildStreams() << " -o \"" - << outputDir << outputFilename << ".as\"" + << outputDir << outputFilename + << executable_suffix << "\"" << std::endl; } } |