diff options
| author | Brad King <brad.king@kitware.com> | 2012-10-02 14:06:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-02 14:06:54 (GMT) |
| commit | 851a3a0b750cde77ae6cb0895fac1e19e020c05e (patch) | |
| tree | 4172158846684998934e203053ecf10e8e74177b /Modules/Platform/Windows-Intel.cmake | |
| parent | 3aa15d62f873161e8cbce5d4855101daefd971ab (diff) | |
| parent | dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c (diff) | |
| download | CMake-851a3a0b750cde77ae6cb0895fac1e19e020c05e.zip CMake-851a3a0b750cde77ae6cb0895fac1e19e020c05e.tar.gz CMake-851a3a0b750cde77ae6cb0895fac1e19e020c05e.tar.bz2 | |
Merge topic 'ninja-link-rsp-expand'
dbd99d6 Revert "Ninja: don't expand any rsp files"
f1670ab Ninja: don't confuse ninja's rsp files with nmake's
Diffstat (limited to 'Modules/Platform/Windows-Intel.cmake')
| -rw-r--r-- | Modules/Platform/Windows-Intel.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake index 41e150a..3a30a2e 100644 --- a/Modules/Platform/Windows-Intel.cmake +++ b/Modules/Platform/Windows-Intel.cmake @@ -98,14 +98,11 @@ macro(__windows_compiler_intel lang) set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2") if(_INTEL_COMPILER_SUPPORTS_MANIFEST) - if(CMAKE_GENERATOR MATCHES "Ninja") - set(NO_RSP_EXPAND _no_rsp_expand) - endif() set(CMAKE_${lang}_LINK_EXECUTABLE - "<CMAKE_COMMAND> -E vs_link_exe${NO_RSP_EXPAND} ${CMAKE_${lang}_LINK_EXECUTABLE}") + "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_${lang}_LINK_EXECUTABLE}") set(CMAKE_${lang}_CREATE_SHARED_LIBRARY - "<CMAKE_COMMAND> -E vs_link_dll${NO_RSP_EXPAND} ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}") + "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}") set(CMAKE_${lang}_CREATE_SHARED_MODULE - "<CMAKE_COMMAND> -E vs_link_dll${NO_RSP_EXPAND} ${CMAKE_${lang}_CREATE_SHARED_MODULE}") + "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_MODULE}") endif() endmacro() |