diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-18 13:09:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-18 14:02:53 (GMT) |
| commit | 109a7a245acf0c367ac092f6c9a20661e7a31529 (patch) | |
| tree | b4e786f43b4bec7a75f4854e10cd0745e82c765d /Modules/CMakeDetermineCXXCompiler.cmake | |
| parent | 828c05b9f567e0652ebbee6df2799a189ff586fe (diff) | |
| download | CMake-109a7a245acf0c367ac092f6c9a20661e7a31529.zip CMake-109a7a245acf0c367ac092f6c9a20661e7a31529.tar.gz CMake-109a7a245acf0c367ac092f6c9a20661e7a31529.tar.bz2 | |
Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596)
Move detection over to the compiler id logic where we have already
constructed the list of compiler flags from ARG1 and CMAKE_<LANG>_FLAGS.
Pass the flags when we execute "cl" with "/showIncludes". Also pass "/c"
because we only need to compile, not link. Check the compiler process
exit code before trusting its output.
Diffstat (limited to 'Modules/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index f25a2db..680356d 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -171,7 +171,6 @@ endif () include(CMakeFindBinUtils) if(MSVC_CXX_ARCHITECTURE_ID) - include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake) set(SET_MSVC_CXX_ARCHITECTURE_ID "set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})") endif() |