diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-08-21 09:04:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-08-21 09:04:09 (GMT) |
| commit | 733deb66c63dbbd8caa84f7630318c6f76da2d9f (patch) | |
| tree | 0b2a5b44cc2ff17838acc7bd37cc68416b42a58a | |
| parent | 3dae652b4ea8e039dd9f4d845497ec988fbbe82c (diff) | |
| download | CMake-733deb66c63dbbd8caa84f7630318c6f76da2d9f.zip CMake-733deb66c63dbbd8caa84f7630318c6f76da2d9f.tar.gz CMake-733deb66c63dbbd8caa84f7630318c6f76da2d9f.tar.bz2 | |
Fix CompileDefinitions test on Visual Studio.
Avoid testing unsupported spaces in define values.
| -rw-r--r-- | Tests/CompileDefinitions/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/CompileDefinitions/main.cpp | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt index 3e4181b..337aeb1 100644 --- a/Tests/CompileDefinitions/CMakeLists.txt +++ b/Tests/CompileDefinitions/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8) project(CompileDefinitions) +if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6") + add_definitions(-DNO_SPACES_IN_DEFINE_VALUES) +endif() + add_subdirectory(add_definitions_command) add_subdirectory(target_prop) add_subdirectory(add_definitions_command_with_target_prop) diff --git a/Tests/CompileDefinitions/main.cpp b/Tests/CompileDefinitions/main.cpp index d80c9dc..6db6f3f 100644 --- a/Tests/CompileDefinitions/main.cpp +++ b/Tests/CompileDefinitions/main.cpp @@ -15,11 +15,16 @@ template<> struct CMakeStaticAssert<true> {}; static const char fun_string[] = CMAKE_IS_; +#ifndef NO_SPACES_IN_DEFINE_VALUES static const char very_fun_string[] = CMAKE_IS_REALLY; +#endif enum { - StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>), + StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>) +#ifndef NO_SPACES_IN_DEFINE_VALUES + , StringLiteralTest2 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_REALLY) == sizeof("Very Fun")>) +#endif }; int main(int argc, char **argv) |