[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-885-g9e73d61

[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  9e73d61677491b947cc998787230199a4bd196f8 (commit)
       via  dcc49d9c55b6551f5797ee2cbc4980c981e312c0 (commit)
       via  c1dde67e62868529aaea807a3664b2eef9389a5b (commit)
      from  7d0bfb400c29f2bb4226a6ecc9648fff58414a39 (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=9e73d61677491b947cc998787230199a4bd196f8
commit 9e73d61677491b947cc998787230199a4bd196f8
Merge: 7d0bfb4 dcc49d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 11:04:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 11:04:58 2014 -0400

    Merge topic 'update-kwsys' into next
    
    dcc49d9c Merge branch 'upstream-kwsys' into update-kwsys
    c1dde67e KWSys 2014-03-12 (dd873734)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcc49d9c55b6551f5797ee2cbc4980c981e312c0
commit dcc49d9c55b6551f5797ee2cbc4980c981e312c0
Merge: cb8f87f c1dde67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 11:04:42 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 12 11:04:42 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1dde67e62868529aaea807a3664b2eef9389a5b
commit c1dde67e62868529aaea807a3664b2eef9389a5b
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Wed Mar 12 10:58:16 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 12 11:04:37 2014 -0400

    KWSys 2014-03-12 (dd873734)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ dd873734 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 9c653603..dd873734
    Brad King (1):
          88c5a768 Set policy CMP0025 to NEW within KWSys
    
    Stephen Kelly (1):
          dd873734 SystemTools: Remove some unnecessary c_str() calls
    
    Change-Id: I5487fefcb3e44875ed5748fb2c4ab8302fcef984

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52bcfe1..977d57b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,9 @@
 # written.
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+IF(POLICY CMP0025)
+  CMAKE_POLICY(SET CMP0025 NEW)
+ENDIF()
 
 #-----------------------------------------------------------------------------
 # If a namespace is not specified, use "kwsys" and enable testing.
diff --git a/SystemTools.cxx b/SystemTools.cxx
index b6a2437..32e79e6 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4918,8 +4918,8 @@ void SystemTools::ClassInitialize()
 
         // Strip off one directory level and see if the logical
         // mapping still works.
-        pwd_str = SystemTools::GetFilenamePath(pwd_str.c_str());
-        cwd_str = SystemTools::GetFilenamePath(cwd_str.c_str());
+        pwd_str = SystemTools::GetFilenamePath(pwd_str);
+        cwd_str = SystemTools::GetFilenamePath(cwd_str);
         Realpath(pwd_str.c_str(), pwd_path);
         }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake