[Cmake-commits] CMake branch, next, updated. v3.2.2-2626-g18af65b

[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  18af65b56d609acd43678cde7b2b989c0b37fd9c (commit)
       via  3a09fca549b994de65b19adaae68b37164eb9317 (commit)
      from  6139efe62ff057a9d1eb2394e8ca300851003e66 (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=18af65b56d609acd43678cde7b2b989c0b37fd9c
commit 18af65b56d609acd43678cde7b2b989c0b37fd9c
Merge: 6139efe 3a09fca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 08:42:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 08:42:19 2015 -0400

    Merge topic 'replace-make--i' into next
    
    3a09fca5 Revert "cmGlobalUnixMakefileGenerator3: use -k rather than -i"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a09fca549b994de65b19adaae68b37164eb9317
commit 3a09fca549b994de65b19adaae68b37164eb9317
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 08:40:59 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 8 08:40:59 2015 -0400

    Revert "cmGlobalUnixMakefileGenerator3: use -k rather than -i"
    
    This reverts commit 0f5c6d89535655a83953b5b58ad8422778736780.
    The -k flag is not valid on some make tools (e.g. Borland),
    and some make tools have no equivalent for it.  We will have
    to investigate alternative approaches or tool-specific behavior.

diff --git a/Help/release/dev/replace-make--i.rst b/Help/release/dev/replace-make--i.rst
deleted file mode 100644
index db50382..0000000
--- a/Help/release/dev/replace-make--i.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-replace-make--i
----------------
-
-* When building with :command:`ctest_build`, use ``-k`` rather than ``-i`` so
-  that the return code is meaningful.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 67cb23f..165a3c8 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,7 +198,7 @@ protected:
 
   cmGeneratedFileStream *CommandDatabase;
 private:
-  virtual const char* GetBuildIgnoreErrorsFlag() const { return "-k"; }
+  virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; }
   virtual std::string GetEditCacheCommand() const;
 };
 

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

Summary of changes:
 Help/release/dev/replace-make--i.rst    |    5 -----
 Source/cmGlobalUnixMakefileGenerator3.h |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 Help/release/dev/replace-make--i.rst


hooks/post-receive
-- 
CMake