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 | |
| 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')
| -rw-r--r-- | Tests/PrecompiledHeader/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/Preprocess/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/VSExternalInclude/CMakeLists.txt | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Tests/PrecompiledHeader/CMakeLists.txt b/Tests/PrecompiledHeader/CMakeLists.txt index b0b7989..00c3980 100644 --- a/Tests/PrecompiledHeader/CMakeLists.txt +++ b/Tests/PrecompiledHeader/CMakeLists.txt @@ -9,10 +9,13 @@ ENDIF(NOT MSVC) # Compute a custom name for the precompiled header. IF(CMAKE_CONFIGURATION_TYPES) SET(PCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/PCH/${CMAKE_CFG_INTDIR}") + FOREACH(cfg ${CMAKE_CONFIGURATION_TYPES}) + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PCH/${cfg}) + ENDFOREACH() ELSE(CMAKE_CONFIGURATION_TYPES) SET(PCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/PCH") + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PCH) ENDIF(CMAKE_CONFIGURATION_TYPES) -FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PCH) # The VS6 IDE does not support renaming .pch files with /Fp. IF("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") 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 ';' diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt index 5f4a6aa..4814cc8 100644 --- a/Tests/VSExternalInclude/CMakeLists.txt +++ b/Tests/VSExternalInclude/CMakeLists.txt @@ -6,7 +6,9 @@ IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") ELSE(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") SET(PROJECT_EXT vcproj) ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 6") - +IF(${CMAKE_GENERATOR} MATCHES "Visual Studio 10") + SET(PROJECT_EXT vcxproj) +ENDIF() # make sure directories exists SET(LIB1_BINARY_DIR ${VSExternalInclude_BINARY_DIR}/Lib1) @@ -38,3 +40,4 @@ ADD_EXECUTABLE(VSExternalInclude ${SOURCES}) # target depends on lib2 ADD_DEPENDENCIES(VSExternalInclude lib2) + |