diff options
author | Brad King <brad.king@kitware.com> | 2013-06-05 13:39:41 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-05 13:39:41 (GMT) |
commit | 31a02203977fdbb518bf796ceb1f9170046456dd (patch) | |
tree | 2b00119cd3bfb507e128889905b082e18bc76682 | |
parent | bf57982f7b52b8ed7a3da4099442d6cda36280bb (diff) | |
parent | c91e88d0e15f38616284f12fc0f2152ac6c0562c (diff) | |
download | CMake-31a02203977fdbb518bf796ceb1f9170046456dd.zip CMake-31a02203977fdbb518bf796ceb1f9170046456dd.tar.gz CMake-31a02203977fdbb518bf796ceb1f9170046456dd.tar.bz2 |
Merge topic 'update-kwsys'
c91e88d Merge branch 'upstream-kwsys' into update-kwsys
6dc3dd9 KWSys 2013-06-03 (d79a792e)
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 652649f..7891708 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -3085,7 +3085,7 @@ SystemToolsAppendComponents( { if(*i == "..") { - if(out_components.begin() != out_components.end()) + if(out_components.size() > 1) { out_components.erase(out_components.end()-1, out_components.end()); } |