diff options
| author | David Cole <david.cole@kitware.com> | 2008-12-11 20:55:46 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2008-12-11 20:55:46 (GMT) |
| commit | 3ddb9dfdea1c8049e5e7e7b6390e4ec5612d4bfe (patch) | |
| tree | f7bb5496e009273c2b53893eefaa6f3563c731c0 | |
| parent | a87bb1b2f93904da1a829b0f66e94dc5697bd1b5 (diff) | |
| download | CMake-3ddb9dfdea1c8049e5e7e7b6390e4ec5612d4bfe.zip CMake-3ddb9dfdea1c8049e5e7e7b6390e4ec5612d4bfe.tar.gz CMake-3ddb9dfdea1c8049e5e7e7b6390e4ec5612d4bfe.tar.bz2 | |
BUG: One more conditional in the ExternalProject test to prevent build errors of Tutorial Step5 on Win98 using Visual Studio 6 when the path length of its build tree exceeds 72 characters. Crazy, perhaps. But this fixes the last real dashboard failure of the ExternalProject test.
| -rw-r--r-- | Tests/ExternalProject/CMakeLists.txt | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index e31a0b6..792374b 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -24,6 +24,22 @@ if(NOT DEFINED can_build_kwstyle) endif() endif() +if(NOT DEFINED can_build_tutorial_step5) + set(can_build_tutorial_step5 1) + + # Tutorial Step5 cannot build correctly using Visual Studio 6 + # on Windows 98 if the path of its build tree exceeds 72 + # characters in length... So don't attempt to build it + # in a long path on Win98: + # + if(CMAKE_SYSTEM STREQUAL "Windows-4.10") + string(LENGTH "${build_dir}/TutorialStep5-Local" n) + if(n GREATER 72) + set(can_build_tutorial_step5 0) + endif() + endif() +endif() + if(NOT DEFINED can_use_cvs) try_cvs_checkout( ":pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake" @@ -44,6 +60,7 @@ if(NOT DEFINED can_use_svn) endif() message(STATUS "can_build_kwstyle='${can_build_kwstyle}'") +message(STATUS "can_build_tutorial_step5='${can_build_tutorial_step5}'") message(STATUS "can_use_cvs='${can_use_cvs}'") message(STATUS "can_use_svn='${can_use_svn}'") @@ -85,11 +102,13 @@ add_external_project(${proj} # Local DIR: # -set(proj TutorialStep5-Local) -add_external_project(${proj} - DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" - CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" -) +if(can_build_tutorial_step5) + set(proj TutorialStep5-Local) + add_external_project(${proj} + DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" + CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" + ) +endif() # Local TAR: @@ -170,7 +189,6 @@ if(can_use_cvs) CVS_MODULE "KWStyle" CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\"" DEPENDS "EmptyNoOpProject" - DEPENDS "TutorialStep5-Local" DEPENDS "TutorialStep1-LocalTAR" DEPENDS "TutorialStep1-LocalNoDirTAR" DEPENDS "TutorialStep1-LocalTGZ" @@ -231,8 +249,10 @@ set(header "${install_dir}/include/TutorialConfig.h") # # BuildTree tests: # -add_test(TutorialStep5-Local-BuildTreeTest - "${build_dir}/TutorialStep5-Local/Tutorial" 42) +if(can_build_tutorial_step5) + add_test(TutorialStep5-Local-BuildTreeTest + "${build_dir}/TutorialStep5-Local/Tutorial" 42) +endif() add_test(TutorialStep1-LocalTAR-BuildTreeTest "${build_dir}/TutorialStep1-LocalTAR/Tutorial" 36) @@ -273,8 +293,10 @@ endif() # InstallTree tests: # -add_test(TutorialStep5-InstallTreeTest - "${install_dir}/bin/Tutorial" 49) +if(can_build_tutorial_step5) + add_test(TutorialStep5-InstallTreeTest + "${install_dir}/bin/Tutorial" 49) +endif() if(can_use_cvs) if(can_build_kwstyle) |