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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Workaround for Watcom WMake not handling "always out of date" custom commands to fix the failing ExternalProject test on the CMake nightly dashboard.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CMakeLists.txt	11 Dec 2008 20:55:46 -0000	1.9
--- CMakeLists.txt	23 Dec 2008 15:01:53 -0000	1.10
***************
*** 60,67 ****
--- 60,80 ----
  endif()
  
+ # WATCOM WMake cannot handle "always out of date" custom commands,
+ # so force the update_step to be an up-to-date no-op instead of a
+ # cvs/svn update...
+ #
+ set(update_step)
+ if(WATCOM)
+   set(update_step
+     UPDATE_COMMAND ${CMAKE_COMMAND}
+     UPDATE_ARGS "-E echo no-op update step"
+   )
+ 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}'")
+ message(STATUS "update_step='${update_step}'")
  
  
***************
*** 168,171 ****
--- 181,185 ----
      CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
+     ${update_step}
    )
  
***************
*** 179,182 ****
--- 193,197 ----
      CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
+     ${update_step}
    )
  
***************
*** 196,199 ****
--- 211,215 ----
        DEPENDS "TutorialStep1-20081201"
        DEPENDS "kwsys-from-CMake-2-6-2"
+       ${update_step}
      )
    endif()
***************
*** 211,214 ****
--- 227,231 ----
      SVN_TAG "-r\;{2008-12-04 01:00:00 +0000}"
      CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
+     ${update_step}
    )
  
***************
*** 221,224 ****
--- 238,242 ----
      CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
+     ${update_step}
    )
  
***************
*** 230,233 ****
--- 248,252 ----
      CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
+     ${update_step}
    )
  endif()