[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.8 1.9

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv17298

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CMakeLists.txt	10 Dec 2008 16:30:51 -0000	1.8
--- CMakeLists.txt	11 Dec 2008 20:55:46 -0000	1.9
***************
*** 25,28 ****
--- 25,44 ----
  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(
***************
*** 45,48 ****
--- 61,65 ----
  
  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}'")
***************
*** 86,94 ****
  # 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}\""
! )
  
  
--- 103,113 ----
  # Local DIR:
  #
! 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()
  
  
***************
*** 171,175 ****
        CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
        DEPENDS "EmptyNoOpProject"
-       DEPENDS "TutorialStep5-Local"
        DEPENDS "TutorialStep1-LocalTAR"
        DEPENDS "TutorialStep1-LocalNoDirTAR"
--- 190,193 ----
***************
*** 232,237 ****
  # BuildTree tests:
  #
! add_test(TutorialStep5-Local-BuildTreeTest
!   "${build_dir}/TutorialStep5-Local/Tutorial" 42)
  
  add_test(TutorialStep1-LocalTAR-BuildTreeTest
--- 250,257 ----
  # BuildTree tests:
  #
! if(can_build_tutorial_step5)
!   add_test(TutorialStep5-Local-BuildTreeTest
!     "${build_dir}/TutorialStep5-Local/Tutorial" 42)
! endif()
  
  add_test(TutorialStep1-LocalTAR-BuildTreeTest
***************
*** 274,279 ****
  # InstallTree tests:
  #
! add_test(TutorialStep5-InstallTreeTest
!   "${install_dir}/bin/Tutorial" 49)
  
  if(can_use_cvs)
--- 294,301 ----
  # InstallTree tests:
  #
! if(can_build_tutorial_step5)
!   add_test(TutorialStep5-InstallTreeTest
!     "${install_dir}/bin/Tutorial" 49)
! endif()
  
  if(can_use_cvs)