Browse Source

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
KWSys Robot 11 years ago
parent
commit
c1dde67e62
2 changed files with 5 additions and 2 deletions
  1. 3 0
      CMakeLists.txt
  2. 2 2
      SystemTools.cxx

+ 3 - 0
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.

+ 2 - 2
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);
         }