kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
KWSys Robot 2014-03-12 10:58:16 -04:00 committed by Brad King
parent c236691b32
commit c1dde67e62
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -85,6 +85,9 @@
# written. # written.
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR) 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. # If a namespace is not specified, use "kwsys" and enable testing.

4
SystemTools.cxx
View File

@ -4918,8 +4918,8 @@ void SystemTools::ClassInitialize()
// Strip off one directory level and see if the logical // Strip off one directory level and see if the logical
// mapping still works. // mapping still works.
pwd_str = SystemTools::GetFilenamePath(pwd_str.c_str()); pwd_str = SystemTools::GetFilenamePath(pwd_str);
cwd_str = SystemTools::GetFilenamePath(cwd_str.c_str()); cwd_str = SystemTools::GetFilenamePath(cwd_str);
Realpath(pwd_str.c_str(), pwd_path); Realpath(pwd_str.c_str(), pwd_path);
} }