diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-23 15:20:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-30 13:42:40 (GMT) |
| commit | 485a940e4c2b07f08e70b6e04733feb724bb6f3f (patch) | |
| tree | b9d56a7526ba4a951d6c8e83f9c83053cb44c809 /Modules/CMakeTestCXXCompiler.cmake | |
| parent | 32db033b2713d40899865a06f03d83373078eaa3 (diff) | |
| download | CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.zip CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.tar.gz CMake-485a940e4c2b07f08e70b6e04733feb724bb6f3f.tar.bz2 | |
VS: Simplify MSVC version reporting
Teach Windows-cl.cmake to use CMAKE_(C|CXX)_COMPILER_VERSION to set the
"MSVC##" and MSVC_VERSION variables. It no longer needs the IDE generator
to dictate the version or to detect the version by running the
command-line tool for NMake and Ninja generators. Drop configuration of
CMakeCPlatform.cmake and CMakeCXXPlatform.cmake from Windows-cl.cmake.in
because all the results it saved are now cheap to compute every time.
Diffstat (limited to 'Modules/CMakeTestCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeTestCXXCompiler.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/CMakeTestCXXCompiler.cmake b/Modules/CMakeTestCXXCompiler.cmake index 5ed826b..3aa2075 100644 --- a/Modules/CMakeTestCXXCompiler.cmake +++ b/Modules/CMakeTestCXXCompiler.cmake @@ -34,11 +34,6 @@ endif() if(NOT CMAKE_CXX_COMPILER_WORKS) PrintTestCompilerStatus("CXX" " -- broken") - # if the compiler is broken make sure to remove the platform file - # since Windows-cl configures both c/cxx files both need to be removed - # when c or c++ fails - file(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake ) - file(REMOVE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake ) file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Determining if the CXX compiler works failed with " "the following output:\n${__CMAKE_CXX_COMPILER_OUTPUT}\n\n") |