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 | |
| 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)
| -rw-r--r-- | Modules/Compiler/GHS-C.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/GHS-CXX.cmake | 2 | ||||
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Modules/Compiler/GHS-C.cmake b/Modules/Compiler/GHS-C.cmake index e97d62c..a58d9b0 100644 --- a/Modules/Compiler/GHS-C.cmake +++ b/Modules/Compiler/GHS-C.cmake @@ -12,6 +12,8 @@ set(CMAKE_C_GHS_KERNEL_FLAGS_RELEASE_INIT "${CMAKE_C_FLAGS_RELEASE_INIT}") set(CMAKE_C_GHS_KERNEL_FLAGS_RELWITHDEBINFO_INIT "-ldebug ${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}") +set(CMAKE_EXECUTABLE_SUFFIX ".as") + if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) set (CMAKE_C_GHS_KERNEL_FLAGS_DEBUG "${CMAKE_C_GHS_KERNEL_FLAGS_DEBUG_INIT}" CACHE STRING "Kernel flags used by the compiler during debug builds.") diff --git a/Modules/Compiler/GHS-CXX.cmake b/Modules/Compiler/GHS-CXX.cmake index 71a0dec..9e202d3 100644 --- a/Modules/Compiler/GHS-CXX.cmake +++ b/Modules/Compiler/GHS-CXX.cmake @@ -15,6 +15,8 @@ set(CMAKE_CXX_GHS_KERNEL_FLAGS_RELEASE_INIT set(CMAKE_CXX_GHS_KERNEL_FLAGS_RELWITHDEBINFO_INIT "-ldebug ${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}") +set(CMAKE_EXECUTABLE_SUFFIX ".as") + if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) set (CMAKE_CXX_GHS_KERNEL_FLAGS_DEBUG "${CMAKE_CXX_GHS_KERNEL_FLAGS_DEBUG_INIT}" 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; } } |