[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Preprocess
In directory public:/mounts/ram/cvs-serv16370/Tests/Preprocess

Modified Files:
	CMakeLists.txt 
Log Message:
ENH:  almost all tests passing in vs 10, commit fixes preprocess and starts vs external project


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Preprocess/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** CMakeLists.txt	8 Jul 2009 15:41:39 -0000	1.14
--- CMakeLists.txt	13 Jul 2009 20:58:24 -0000	1.15
***************
*** 35,38 ****
--- 35,41 ----
    set(PP_VS 1)
  endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 10")
+   set(PP_VS100 1)
+ endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio 10")
  
  # Some tests below check the PP_* variables set above.  They are meant
***************
*** 50,54 ****
  set(STRING_EXTRA "")
  
! if(NOT BORLAND AND NOT PP_VS70)
    # Borland, VS70 IDE: ;
    # The Borland compiler will simply not accept a non-escaped semicolon
--- 53,57 ----
  set(STRING_EXTRA "")
  
! if(NOT BORLAND AND NOT PP_VS70 AND NOT PP_VS100)
    # Borland, VS70 IDE: ;
    # The Borland compiler will simply not accept a non-escaped semicolon
***************
*** 58,63 ****
    # 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 AND NOT PP_VS70)
  
  if(NOT PP_VS6)
--- 61,67 ----
    # The VS 7.0 IDE separates definitions on semicolons and commas with
    # no regard for quotes.  Fortunately VS 7.1 and above are okay.
+   # VS 10 seems to also not like semicolons
    set(SEMICOLON "\;")
! endif()
  
  if(NOT PP_VS6)