summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-21 13:16:53 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-21 13:16:53 (GMT)
commit8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (patch)
tree1d9d8e090df3173516903387ab7d6dba49fe4fd2 /Modules
parent196de9d14d281103e0ee5c36e9dfd39504804aeb (diff)
parent123de1914c7e7d53d1e295c73994b2780041b8fc (diff)
downloadCMake-8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e.zip
CMake-8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e.tar.gz
CMake-8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e.tar.bz2
Merge topic 'ninja-refactor-deptype-selection'
123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Windows-MSVC.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index b421b0d..a61413a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -302,6 +302,7 @@ macro(__windows_compiler_msvc lang)
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
+ set(CMAKE_NINJA_DEPTYPE_${lang} msvc)
if(NOT CMAKE_RC_COMPILER_INIT)
set(CMAKE_RC_COMPILER_INIT rc)
@@ -311,4 +312,5 @@ macro(__windows_compiler_msvc lang)
endif()
enable_language(RC)
+ set(CMAKE_NINJA_CMCLDEPS_RC 1)
endmacro()