[Cmake-commits] CMake branch, next, updated. v3.7.1-2093-g3dd0616

[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  3dd0616af3c5928e5c880186d5cfd241506a4369 (commit)
       via  efff7086c66d63c62d9474eca5a3b2d21d725bfe (commit)
      from  a37e6e27efa5729c6136105f6bd702986050d58c (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=3dd0616af3c5928e5c880186d5cfd241506a4369
commit 3dd0616af3c5928e5c880186d5cfd241506a4369
Merge: a37e6e2 efff708
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 15:06:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 15:06:11 2017 -0500

    Merge topic 'asan_overriding_user_options' into next
    
    efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efff7086c66d63c62d9474eca5a3b2d21d725bfe
commit efff7086c66d63c62d9474eca5a3b2d21d725bfe
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Wed Jan 11 18:58:19 2017 +0100
Commit:     Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Wed Jan 11 19:27:45 2017 +0100

    ctest_memcheck: Append sanitizers user options at the end to allow overriding

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 4d23e45..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -634,7 +634,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       std::string outputFile =
         envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
-        outputFile + extraOptions + suppressionsOption;
+        outputFile + suppressionsOption + extraOptions;
       break;
     }
     default:

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake