diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-03-12 14:58:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-12 15:04:37 (GMT) |
| commit | c1dde67e62868529aaea807a3664b2eef9389a5b (patch) | |
| tree | 4e432d4f1afa5c2349f30aa0b9dc5aa66923a64c | |
| parent | c236691b32f4532d4da6db77322b4446e3802e3f (diff) | |
| download | CMake-c1dde67e62868529aaea807a3664b2eef9389a5b.zip CMake-c1dde67e62868529aaea807a3664b2eef9389a5b.tar.gz CMake-c1dde67e62868529aaea807a3664b2eef9389a5b.tar.bz2 | |
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
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | SystemTools.cxx | 4 |
2 files changed, 5 insertions, 2 deletions
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); } |