[cmake-commits] king committed CMakeLists.txt 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 14 11:21:08 EST 2008
Update of /cvsroot/CMake/CMake/Tests/Preprocess
In directory public:/mounts/ram/cvs-serv26499/Preprocess
Modified Files:
CMakeLists.txt
Log Message:
BUG: Disable semicolon test on VS 7.0.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Preprocess/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMakeLists.txt 14 Jan 2008 14:20:58 -0000 1.1
+++ CMakeLists.txt 14 Jan 2008 16:21:06 -0000 1.2
@@ -16,13 +16,16 @@
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
More information about the Cmake-commits
mailing list