diff options
author | Brad King <brad.king@kitware.com> | 2016-08-02 13:21:52 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-08-02 13:21:52 (GMT) |
commit | 35995fa6b5872b58f086d16b16ca90d7d259d9b0 (patch) | |
tree | 820632c7a1a055b1ec611ecfb918191b9a39295d /Source/kwsys/SystemTools.cxx | |
parent | fd59f9ad519c1c311c54569133797d9061e90558 (diff) | |
parent | 6bc3073e23af70bde3e8a7659aa51a784deeec9c (diff) | |
download | CMake-35995fa6b5872b58f086d16b16ca90d7d259d9b0.zip CMake-35995fa6b5872b58f086d16b16ca90d7d259d9b0.tar.gz CMake-35995fa6b5872b58f086d16b16ca90d7d259d9b0.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-08-01 (560bcdbb)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 0526372..9b56db0 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -523,7 +523,7 @@ void SystemTools::GetPath(std::vector<std::string>& path, const char* env) } } -const char* SystemTools::GetEnv(const char* key) +const char* SystemTools::GetEnvImpl(const char* key) { const char *v = 0; #if defined(_WIN32) @@ -540,9 +540,14 @@ const char* SystemTools::GetEnv(const char* key) return v; } +const char* SystemTools::GetEnv(const char* key) +{ + return SystemTools::GetEnvImpl(key); +} + const char* SystemTools::GetEnv(const std::string& key) { - return SystemTools::GetEnv(key.c_str()); + return SystemTools::GetEnvImpl(key.c_str()); } bool SystemTools::GetEnv(const char* key, std::string& result) |