diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-10 12:57:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-10 12:57:05 (GMT) |
| commit | ea6e5903e7e5feb9df7c904bd94b119e83d35e18 (patch) | |
| tree | dffe4373831ce9288fa3adf09667fc10f4c2874f /Modules | |
| parent | e110ab9e218634b4aefec138a89ea856738f897f (diff) | |
| parent | 11f4c19d7babf5412efeebdb030dddfb9b7db366 (diff) | |
| download | CMake-ea6e5903e7e5feb9df7c904bd94b119e83d35e18.zip CMake-ea6e5903e7e5feb9df7c904bd94b119e83d35e18.tar.gz CMake-ea6e5903e7e5feb9df7c904bd94b119e83d35e18.tar.bz2 | |
Merge topic 'ipo-escape-toolchain-path'
11f4c19d IPO: Fix support for spaces in path to archive tools
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1356
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 6 | ||||
| -rw-r--r-- | Modules/Compiler/GNU.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index 7d476f9..9f5e921 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -69,15 +69,15 @@ else() endif() set(CMAKE_${lang}_ARCHIVE_CREATE_IPO - "${__ar} cr <TARGET> <LINK_FLAGS> <OBJECTS>" + "\"${__ar}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>" ) set(CMAKE_${lang}_ARCHIVE_APPEND_IPO - "${__ar} r <TARGET> <LINK_FLAGS> <OBJECTS>" + "\"${__ar}\" r <TARGET> <LINK_FLAGS> <OBJECTS>" ) set(CMAKE_${lang}_ARCHIVE_FINISH_IPO - "${__ranlib} <TARGET>" + "\"${__ranlib}\" <TARGET>" ) endmacro() endif() diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index 675e505..d962688 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -75,15 +75,15 @@ macro(__compiler_gnu lang) # # [1]: https://gcc.gnu.org/onlinedocs/gcc-4.9.4/gcc/Optimize-Options.html set(CMAKE_${lang}_ARCHIVE_CREATE_IPO - "${CMAKE_${lang}_COMPILER_AR} cr <TARGET> <LINK_FLAGS> <OBJECTS>" + "\"${CMAKE_${lang}_COMPILER_AR}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>" ) set(CMAKE_${lang}_ARCHIVE_APPEND_IPO - "${CMAKE_${lang}_COMPILER_AR} r <TARGET> <LINK_FLAGS> <OBJECTS>" + "\"${CMAKE_${lang}_COMPILER_AR}\" r <TARGET> <LINK_FLAGS> <OBJECTS>" ) set(CMAKE_${lang}_ARCHIVE_FINISH_IPO - "${CMAKE_${lang}_COMPILER_RANLIB} <TARGET>" + "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>" ) endif() endmacro() |