summaryrefslogtreecommitdiffstats
path: root/Tests/Preprocess
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-01-14 16:21:06 (GMT)
committerBrad King <brad.king@kitware.com>2008-01-14 16:21:06 (GMT)
commit7849ab756fc60b8435d3381ce06040575a2edbda (patch)
tree398edc2fc0d48e78ce95d19a2cdb40dd0faa8b7b /Tests/Preprocess
parent75a02152c2f634f66ed4ad9e8f736a17cc23484a (diff)
downloadCMake-7849ab756fc60b8435d3381ce06040575a2edbda.zip
CMake-7849ab756fc60b8435d3381ce06040575a2edbda.tar.gz
CMake-7849ab756fc60b8435d3381ce06040575a2edbda.tar.bz2
BUG: Disable semicolon test on VS 7.0.
Diffstat (limited to 'Tests/Preprocess')
-rw-r--r--Tests/Preprocess/CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 3631072..ae2fa99 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -16,13 +16,16 @@ if("${CMAKE_GENERATOR}" MATCHES "Make" AND MSVC)
set(NMAKE 1)
endif("${CMAKE_GENERATOR}" MATCHES "Make" AND MSVC)
-if(NOT BORLAND)
- # Borland: ;
+if(NOT BORLAND AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$")
+ # Borland, VS70 IDE: ;
# The Borland compiler will simply not accept a non-escaped semicolon
# on the command line. If it is escaped \; then the escape character
# shows up in the preprocessing output too.
+ #
+ # The VS 7.0 IDE separates definitions on semicolons and commas with
+ # no regard for quotes. Fortunately VS 7.1 and above are okay.
set(SEMICOLON "\;")
-endif(NOT BORLAND)
+endif(NOT BORLAND AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$")
if(NOT BORLAND AND NOT WATCOM)
# Borland, WMake: multiple spaces