summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-07 19:20:49 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-20 14:22:07 (GMT)
commit0f8522a6c9c00afc67c367de1e1c3f601f1996e9 (patch)
tree6c5a3c94cf82611498eee851a446e08270c336e7 /Tests
parenta43f44000d12c1357eeed04e5a02d11236730dfa (diff)
downloadCMake-0f8522a6c9c00afc67c367de1e1c3f601f1996e9.zip
CMake-0f8522a6c9c00afc67c367de1e1c3f601f1996e9.tar.gz
CMake-0f8522a6c9c00afc67c367de1e1c3f601f1996e9.tar.bz2
VS: Add MASM support to VS 8 and 9 (#8170, #14984)
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f237f21..7aa31cc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1680,7 +1680,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif()
if(MSVC AND NOT MSVC_VERSION LESS 1310
- AND NOT CMAKE_GENERATOR MATCHES "Visual Studio [6789]( |$)")
+ AND NOT CMAKE_GENERATOR MATCHES "Visual Studio [67]( |$)"
+ AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio [89]( |$)"
+ OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+ )
ADD_TEST_MACRO(VSMASM VSMASM)
endif()