[Cmake-commits] CMake branch, next, updated. v3.2.1-1318-g85de1dd

[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  85de1ddd36462a7ef0fbcc6ea3ecd7d62a515491 (commit)
       via  ff7ecb92c57c91ba0da0bb833dc92fd9a7d9d2fb (commit)
       via  79fe11f106d1587f3e31cb0749ce45805b585d93 (commit)
      from  e84114c69c2ceddd3f9565ddf420664c70788dec (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85de1ddd36462a7ef0fbcc6ea3ecd7d62a515491
commit 85de1ddd36462a7ef0fbcc6ea3ecd7d62a515491
Merge: e84114c ff7ecb9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 13:08:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 13:08:59 2015 -0400

    Merge topic 'add-GreenHills-MULTI-generator' into next
    
    ff7ecb92 GHS: Initialize CMAKE_<LANG>_FLAGS[_<CONFIG>]
    79fe11f1 GHS: Fix tests by finding make program when cleaning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff7ecb92c57c91ba0da0bb833dc92fd9a7d9d2fb
commit ff7ecb92c57c91ba0da0bb833dc92fd9a7d9d2fb
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Tue Mar 31 13:05:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 13:07:40 2015 -0400

    GHS: Initialize CMAKE_<LANG>_FLAGS[_<CONFIG>]

diff --git a/Modules/Compiler/GHS-C.cmake b/Modules/Compiler/GHS-C.cmake
new file mode 100644
index 0000000..836d741
--- /dev/null
+++ b/Modules/Compiler/GHS-C.cmake
@@ -0,0 +1,7 @@
+set(CMAKE_C_VERBOSE_FLAG "-v")
+
+set(CMAKE_C_FLAGS_INIT "")
+set(CMAKE_C_FLAGS_DEBUG_INIT "-Odebug -g")
+set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Ospace")
+set(CMAKE_C_FLAGS_RELEASE_INIT "-O")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O -g")
diff --git a/Modules/Compiler/GHS-CXX.cmake b/Modules/Compiler/GHS-CXX.cmake
new file mode 100644
index 0000000..cd449f7
--- /dev/null
+++ b/Modules/Compiler/GHS-CXX.cmake
@@ -0,0 +1,7 @@
+set(CMAKE_CXX_VERBOSE_FLAG "-v")
+
+set(CMAKE_CXX_FLAGS_INIT "")
+set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
+set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Ospace")
+set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O -g")
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 0455721..c7337d8 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -59,13 +59,13 @@ void cmGlobalGhsMultiGenerator::EnableLanguage(
   mf->AddDefinition("CMAKE_C_COMPILER",
                     std::string(ghsCompRootStart + "ccarm.exe").c_str());
   mf->AddDefinition("CMAKE_C_COMPILER_ID_RUN", "TRUE");
-  mf->AddDefinition("CMAKE_C_COMPILER_ID", "GHSC");
+  mf->AddDefinition("CMAKE_C_COMPILER_ID", "GHS");
   mf->AddDefinition("CMAKE_C_COMPILER_FORCED", "TRUE");
 
   mf->AddDefinition("CMAKE_CXX_COMPILER",
                     std::string(ghsCompRootStart + "cxarm.exe").c_str());
   mf->AddDefinition("CMAKE_CXX_COMPILER_ID_RUN", "TRUE");
-  mf->AddDefinition("CMAKE_CXX_COMPILER_ID", "GHSCXX");
+  mf->AddDefinition("CMAKE_CXX_COMPILER_ID", "GHS");
   mf->AddDefinition("CMAKE_CXX_COMPILER_FORCED", "TRUE");
 
   if (!ghsCompRoot.empty())

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79fe11f106d1587f3e31cb0749ce45805b585d93
commit 79fe11f106d1587f3e31cb0749ce45805b585d93
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Sun Mar 29 20:56:21 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 13:05:02 2015 -0400

    GHS: Fix tests by finding make program when cleaning

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index afd05ae..0455721 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -19,6 +19,7 @@
 #include <cmAlgorithms.h>
 
 const char *cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj";
+const char *cmGlobalGhsMultiGenerator::DEFAULT_MAKE_PROGRAM = "gbuild";
 
 cmGlobalGhsMultiGenerator::cmGlobalGhsMultiGenerator()
   : OSDirRelative(false)
@@ -104,10 +105,13 @@ std::string const &cmGlobalGhsMultiGenerator::GetGhsBuildCommand()
 
 std::string cmGlobalGhsMultiGenerator::FindGhsBuildCommand()
 {
-  std::string makeProgram = cmSystemTools::FindProgram("gbuild");
+  std::vector<std::string> userPaths;
+  userPaths.push_back(this->GetCompRoot());
+  std::string makeProgram =
+    cmSystemTools::FindProgram(DEFAULT_MAKE_PROGRAM, userPaths);
   if (makeProgram.empty())
     {
-    makeProgram = "gbuild";
+    makeProgram = DEFAULT_MAKE_PROGRAM;
     }
   return makeProgram;
 }
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index d5948da..2fea75a 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -120,6 +120,7 @@ private:
   bool OSDirRelative;
   bool GhsBuildCommandInitialized;
   std::string GhsBuildCommand;
+  static const char *DEFAULT_MAKE_PROGRAM;
 };
 
 #endif

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

Summary of changes:
 Modules/Compiler/GHS-C.cmake         |    7 +++++++
 Modules/Compiler/GHS-CXX.cmake       |    7 +++++++
 Source/cmGlobalGhsMultiGenerator.cxx |   12 ++++++++----
 Source/cmGlobalGhsMultiGenerator.h   |    1 +
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 Modules/Compiler/GHS-C.cmake
 create mode 100644 Modules/Compiler/GHS-CXX.cmake


hooks/post-receive
-- 
CMake