[Cmake-commits] CMake branch, next, updated. v3.2.2-2593-gfd1cf6d

[Ben Boeckel]

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  fd1cf6da106a1f77e5d7b0c79c1c01677d41385f (commit)
       via  0f5c6d89535655a83953b5b58ad8422778736780 (commit)
       via  b3ae0609db88d8f82f7fb4f18ddb73f3456a67d2 (commit)
      from  abd6448ad81d3c865c2462a41f965bf5775fc410 (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=fd1cf6da106a1f77e5d7b0c79c1c01677d41385f
commit fd1cf6da106a1f77e5d7b0c79c1c01677d41385f
Merge: abd6448 0f5c6d8
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu May 7 13:01:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 7 13:01:46 2015 -0400

    Merge topic 'replace-make--i' into next
    
    0f5c6d89 cmGlobalUnixMakefileGenerator3: use -k rather than -i
    b3ae0609 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5c6d89535655a83953b5b58ad8422778736780
commit 0f5c6d89535655a83953b5b58ad8422778736780
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu May 7 12:56:28 2015 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu May 7 13:01:04 2015 -0400

    cmGlobalUnixMakefileGenerator3: use -k rather than -i
    
    The `-i` flag ignores errors and causes the return code to always be
    "success". This causes problems because make implementations put "i"
    into the MAKEFLAGS environment variable which is then used in any
    submake invokations. This is particularly bad when using ExternalProject
    which may use `make` during a configure step and can cause a project to
    get invalid results when detecting its environment.
    
    Instead, use `-k` which is similar except that the return code indicates
    whether the tool actually completed successfully or not.

diff --git a/Help/release/dev/replace-make--i.rst b/Help/release/dev/replace-make--i.rst
new file mode 100644
index 0000000..db50382
--- /dev/null
+++ b/Help/release/dev/replace-make--i.rst
@@ -0,0 +1,5 @@
+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 165a3c8..67cb23f 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,7 +198,7 @@ protected:
 
   cmGeneratedFileStream *CommandDatabase;
 private:
-  virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; }
+  virtual const char* GetBuildIgnoreErrorsFlag() const { return "-k"; }
   virtual std::string GetEditCacheCommand() const;
 };
 

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

Summary of changes:
 Help/release/dev/replace-make--i.rst    |    5 +++++
 Source/CMakeVersion.cmake               |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.h |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/replace-make--i.rst


hooks/post-receive
-- 
CMake