diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-07-13 20:58:24 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-07-13 20:58:24 (GMT) |
| commit | 11d42b3e8f17c2b99838045545ae82df54a80b98 (patch) | |
| tree | e246736fdb03f8c0dd3cff46e1067aa81b103a72 /Tests/Preprocess | |
| parent | 724275b26651b06ac5757a68ec8b25a430f5fdc8 (diff) | |
| download | CMake-11d42b3e8f17c2b99838045545ae82df54a80b98.zip CMake-11d42b3e8f17c2b99838045545ae82df54a80b98.tar.gz CMake-11d42b3e8f17c2b99838045545ae82df54a80b98.tar.bz2 | |
ENH: almost all tests passing in vs 10, commit fixes preprocess and starts vs external project
Diffstat (limited to 'Tests/Preprocess')
| -rw-r--r-- | Tests/Preprocess/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt index 04c3f10..f154b6f 100644 --- a/Tests/Preprocess/CMakeLists.txt +++ b/Tests/Preprocess/CMakeLists.txt @@ -34,6 +34,9 @@ endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$") if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") 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 # to test the case that the build tool is at fault. Other tests below @@ -49,7 +52,7 @@ endif("${CMAKE_GENERATOR}" MATCHES "Visual Studio") # must not have it escaped inside the configured header. set(STRING_EXTRA "") -if(NOT BORLAND AND NOT PP_VS70) +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 # on the command line. If it is escaped \; then the escape character @@ -57,8 +60,9 @@ if(NOT BORLAND AND NOT PP_VS70) # # 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(NOT BORLAND AND NOT PP_VS70) +endif() if(NOT PP_VS6) # VS 6 IDE: spaces and '"', '$', or ';' |