diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-06 19:51:33 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-14 16:17:05 (GMT) |
| commit | 5bd48ac5348885e15ebb23ea825a1ea777985b97 (patch) | |
| tree | 340ac037fe081ef314cb12ecdfca2b229c2f4ea8 /Modules/GetPrerequisites.cmake | |
| parent | 2622bc3f65162bf6d6cb5838da6999f8b5ca75cf (diff) | |
| download | CMake-5bd48ac5348885e15ebb23ea825a1ea777985b97.zip CMake-5bd48ac5348885e15ebb23ea825a1ea777985b97.tar.gz CMake-5bd48ac5348885e15ebb23ea825a1ea777985b97.tar.bz2 | |
Replace string(REGEX REPLACE) with string(REPLACE) where possible
The simple replacement is much faster.
Diffstat (limited to 'Modules/GetPrerequisites.cmake')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index ac649e9..05c2edb 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -509,10 +509,10 @@ function(gp_resolved_file_type original_file file exepath dirs type_var) if(WIN32) string(TOLOWER "$ENV{SystemRoot}" sysroot) - string(REGEX REPLACE "\\\\" "/" sysroot "${sysroot}") + file(TO_CMAKE_PATH "${sysroot}" sysroot) string(TOLOWER "$ENV{windir}" windir) - string(REGEX REPLACE "\\\\" "/" windir "${windir}") + file(TO_CMAKE_PATH "${windir}" windir) if(lower MATCHES "^(${sysroot}/sys(tem|wow)|${windir}/sys(tem|wow)|(.*/)*msvc[^/]+dll)") set(is_system 1) @@ -772,8 +772,8 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa # Convert to a list of lines: # - string(REGEX REPLACE ";" "\\\\;" candidates "${gp_cmd_ov}") - string(REGEX REPLACE "\n" "${eol_char};" candidates "${candidates}") + string(REPLACE ";" "\\;" candidates "${gp_cmd_ov}") + string(REPLACE "\n" "${eol_char};" candidates "${candidates}") # check for install id and remove it from list, since otool -L can include a # reference to itself |