diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-21 12:59:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-21 12:59:26 (GMT) |
| commit | d0390f8be0a640942892b1dda114f472ff5e0218 (patch) | |
| tree | 6121be9c63494ad786681f4a01d7e1d690c94bd1 | |
| parent | 228468cf3e1c600e49a581a59e9f998be2c03f11 (diff) | |
| parent | 099a4ea50c4fbe5fe13cf6fa4abcf970c49e787c (diff) | |
| download | CMake-d0390f8be0a640942892b1dda114f472ff5e0218.zip CMake-d0390f8be0a640942892b1dda114f472ff5e0218.tar.gz CMake-d0390f8be0a640942892b1dda114f472ff5e0218.tar.bz2 | |
Merge topic 'cmake_symlink_library-slashes'
099a4ea5 cmcmd: Fix cmake_symlink_library for inconsistent slashes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1612
| -rw-r--r-- | Source/cmcmd.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index b78fbe6..f660f43 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1237,9 +1237,12 @@ int cmcmd::HashSumFile(std::vector<std::string>& args, cmCryptoHash::Algo algo) int cmcmd::SymlinkLibrary(std::vector<std::string>& args) { int result = 0; - std::string const& realName = args[2]; - std::string const& soName = args[3]; - std::string const& name = args[4]; + std::string realName = args[2]; + std::string soName = args[3]; + std::string name = args[4]; + cmSystemTools::ConvertToUnixSlashes(realName); + cmSystemTools::ConvertToUnixSlashes(soName); + cmSystemTools::ConvertToUnixSlashes(name); if (soName != realName) { if (!cmcmd::SymlinkInternal(realName, soName)) { cmSystemTools::ReportLastSystemError("cmake_symlink_library"); |