[Cmake-commits] CMake branch, next, updated. v3.5.0-569-g94df6f7

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  94df6f753ecbf286f8798eecb2f1f3c25f8893fc (commit)
       via  bf3e76d2146485e541ebeed891a8905946b96c9e (commit)
      from  92ad43890f73dd5afb98b6ca24f0c6f71d943abb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94df6f753ecbf286f8798eecb2f1f3c25f8893fc
commit 94df6f753ecbf286f8798eecb2f1f3c25f8893fc
Merge: 92ad438 bf3e76d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 21 10:37:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 21 10:37:52 2016 -0400

    Merge topic 'ghs-try_compile' into next
    
    bf3e76d2 GHS: Fix try_compile (#15975)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf3e76d2146485e541ebeed891a8905946b96c9e
commit bf3e76d2146485e541ebeed891a8905946b96c9e
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Mon Mar 21 05:00:35 2016 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 21 10:35:01 2016 -0400

    GHS: Fix try_compile (#15975)

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;
       }
     }

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/GHS-C.cmake         |    2 ++
 Modules/Compiler/GHS-CXX.cmake       |    2 ++
 Source/cmGhsMultiTargetGenerator.cxx |   10 ++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake