diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-09 11:53:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-09 11:56:26 (GMT) |
| commit | a9badfa6f470452f830f95db77e1ccc8eb65ce93 (patch) | |
| tree | 60ed0d7d7f6e0256b785bfbf99ee05e344125028 /Modules | |
| parent | ea3456c844edeecdf3a84b37b0ebc79a4dcf5591 (diff) | |
| parent | ef6a08f6f7964667e34b4ddf7194fda6b6408795 (diff) | |
| download | CMake-a9badfa6f470452f830f95db77e1ccc8eb65ce93.zip CMake-a9badfa6f470452f830f95db77e1ccc8eb65ce93.tar.gz CMake-a9badfa6f470452f830f95db77e1ccc8eb65ce93.tar.bz2 | |
Merge topic 'intel-windows-xilib'
ef6a08f6f7 Intel: Use xilib as librarian on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christian Pfeiffer <cpfeiffer@live.de>
Merge-request: !2265
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-Intel.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake index ba31001..96b1760 100644 --- a/Modules/Platform/Windows-Intel.cmake +++ b/Modules/Platform/Windows-Intel.cmake @@ -11,7 +11,7 @@ set(__WINDOWS_INTEL 1) include(Platform/Windows-MSVC) macro(__windows_compiler_intel lang) __windows_compiler_msvc(${lang}) - string(REPLACE "<CMAKE_LINKER> /lib" "lib" CMAKE_${lang}_CREATE_STATIC_LIBRARY "${CMAKE_${lang}_CREATE_STATIC_LIBRARY}") + string(REPLACE "<CMAKE_LINKER> /lib" "xilib" CMAKE_${lang}_CREATE_STATIC_LIBRARY "${CMAKE_${lang}_CREATE_STATIC_LIBRARY}") foreach(rule CREATE_SHARED_LIBRARY CREATE_SHARED_MODULE LINK_EXECUTABLE) string(REPLACE "<CMAKE_LINKER>" "xilink" CMAKE_${lang}_${rule} "${CMAKE_${lang}_${rule}}") endforeach() |