[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-161-g85dca2c

[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  85dca2c756691ae8f954f6e4d4d002655ebdd206 (commit)
       via  ceebac93f66c3927997b708caf6f2eb2d1827593 (commit)
      from  ad0f722461761a9bf2a63ae1a124ed7b7a572ffb (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=85dca2c756691ae8f954f6e4d4d002655ebdd206
commit 85dca2c756691ae8f954f6e4d4d002655ebdd206
Merge: ad0f722 ceebac9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 09:11:36 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 09:11:36 2016 -0400

    Merge topic 'watcom-workaround' into next
    
    ceebac93 Tests: Restore fix to Plugin test on Watcom compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ceebac93f66c3927997b708caf6f2eb2d1827593
commit ceebac93f66c3927997b708caf6f2eb2d1827593
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 09:08:59 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 09:11:10 2016 -0400

    Tests: Restore fix to Plugin test on Watcom compiler
    
    The fix in commit v3.4.0-rc1~127^2 (Tests: Fix Plugin test on Watcom
    compiler, 2015-09-03) was reverted accidentally by automated .c_str()
    removal.  Restore it and add a comment explaining why.

diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 86b54f7..017fbf6 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -31,7 +31,9 @@ int main()
   kwsys::DynamicLoader::LibraryHandle handle =
     kwsys::DynamicLoader::OpenLibrary(libName.c_str());
   if (!handle) {
-    std::cerr << "Could not open plugin \"" << libName << "\"!" << std::endl;
+    // Leave the .c_str() on this one.  It is needed on OpenWatcom.
+    std::cerr << "Could not open plugin \"" << libName.c_str() << "\"!"
+              << std::endl;
     return 1;
   }
   kwsys::DynamicLoader::SymbolPointer sym =

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

Summary of changes:
 Tests/Plugin/src/example_exe.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake