diff options
| author | Brad King <brad.king@kitware.com> | 2011-09-23 15:04:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-09-23 15:07:24 (GMT) |
| commit | 3b5256e19e27794ba871b0149f4c8f0237d1e872 (patch) | |
| tree | 4330eec37519bfc68d92c37986dd6bb616142482 /Tests/VSExternalInclude | |
| parent | 3d5632ed59d3d46298304d20d3f11f9d1da02f93 (diff) | |
| download | CMake-3b5256e19e27794ba871b0149f4c8f0237d1e872.zip CMake-3b5256e19e27794ba871b0149f4c8f0237d1e872.tar.gz CMake-3b5256e19e27794ba871b0149f4c8f0237d1e872.tar.bz2 | |
Teach our tests about special cases for VS 11
Teach the CheckCompilerRelatedVariables test to verify MSVC11. Update
the special cases already in the Preprocess and VSExternalInclude tests
for VS 10 to work for VS 11 too.
Diffstat (limited to 'Tests/VSExternalInclude')
| -rw-r--r-- | Tests/VSExternalInclude/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt index 1e68968..a2fd619 100644 --- a/Tests/VSExternalInclude/CMakeLists.txt +++ b/Tests/VSExternalInclude/CMakeLists.txt @@ -6,7 +6,7 @@ IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") ELSE(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") SET(PROJECT_EXT vcproj) ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") -IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 10") +IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[01]") SET(PROJECT_EXT vcxproj) ENDIF() @@ -46,7 +46,7 @@ ADD_DEPENDENCIES(VSExternalInclude lib2) # and the sln file can no longer be the only source # of that depend. So, for VS 10 make the executable # depend on lib1 and lib2 -IF(MSVC10) +IF(MSVC10 OR MSVC11) ADD_DEPENDENCIES(VSExternalInclude lib1) ENDIF() |