diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-30 20:08:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-30 20:18:05 (GMT) |
| commit | 16fa7b73958ca52bebd0d3a2dd6374bd391ed64d (patch) | |
| tree | 70ab83ecaf5643077c38c68edcd19c6e1c8f678f | |
| parent | 32b7c72623a52331e2a965c3b1569143606afffc (diff) | |
| download | CMake-16fa7b73958ca52bebd0d3a2dd6374bd391ed64d.zip CMake-16fa7b73958ca52bebd0d3a2dd6374bd391ed64d.tar.gz CMake-16fa7b73958ca52bebd0d3a2dd6374bd391ed64d.tar.bz2 | |
VS: Fix MSVC_IDE definition recently broken by refactoring
In commit 485a940e (VS: Simplify MSVC version reporting, 2012-08-23) we
accidentally flipped the 0/1 values of MSVC_IDE. Flip them back and
teach the CheckCompilerRelatedVariables test to check the variable.
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 | ||||
| -rw-r--r-- | Tests/CheckCompilerRelatedVariables/CMakeLists.txt | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index b3cb19b..238aa24 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -56,9 +56,9 @@ enable_language(RC) set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") - set(MSVC_IDE 0) -else() set(MSVC_IDE 1) +else() + set(MSVC_IDE 0) endif() if(NOT MSVC_VERSION) diff --git a/Tests/CheckCompilerRelatedVariables/CMakeLists.txt b/Tests/CheckCompilerRelatedVariables/CMakeLists.txt index 8b279a5..20001e6 100644 --- a/Tests/CheckCompilerRelatedVariables/CMakeLists.txt +++ b/Tests/CheckCompilerRelatedVariables/CMakeLists.txt @@ -46,6 +46,7 @@ echo_var(MSVC80) echo_var(MSVC90) echo_var(MSVC10) echo_var(MSVC11) +echo_var(MSVC_IDE) if(MSVC) # @@ -60,6 +61,13 @@ if(MSVC) else() message(FATAL_ERROR "error: ${msvc_total} MSVC** variables are defined -- exactly 1 expected") endif() + if(NOT DEFINED MSVC_IDE) + message(FATAL_ERROR "MSVC_IDE not defined but should be!") + elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio" AND NOT MSVC_IDE) + message(FATAL_ERROR "MSVC_IDE is not true but should be (${CMAKE_GENERATOR})!") + elseif(NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio" AND MSVC_IDE) + message(FATAL_ERROR "MSVC_IDE is true but should not be (${CMAKE_GENERATOR})!") + endif() else() # # The compiler is something other than cl... None of the MSVC** variables @@ -70,6 +78,9 @@ else() else() message(FATAL_ERROR "error: ${msvc_total} MSVC** variables are defined -- exactly 0 expected") endif() + if(DEFINED MSVC_IDE) + message(FATAL_ERROR "MSVC_IDE is defined but should not be!") + endif() endif() |