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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Prevent KWStyle portion of ExternalProject test from configuring, building, installing and testing on WATCOM dashboards. WATCOM STL support is still under development.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeLists.txt	5 Dec 2008 22:54:38 -0000	1.7
--- CMakeLists.txt	10 Dec 2008 16:30:51 -0000	1.8
***************
*** 17,20 ****
--- 17,28 ----
  include("${CMAKE_CURRENT_SOURCE_DIR}/TryCheckout.cmake")
  
+ if(NOT DEFINED can_build_kwstyle)
+   if(WATCOM)
+     set(can_build_kwstyle 0)
+   else()
+     set(can_build_kwstyle 1)
+   endif()
+ endif()
+ 
  if(NOT DEFINED can_use_cvs)
    try_cvs_checkout(
***************
*** 36,39 ****
--- 44,48 ----
  endif()
  
+ message(STATUS "can_build_kwstyle='${can_build_kwstyle}'")
  message(STATUS "can_use_cvs='${can_use_cvs}'")
  message(STATUS "can_use_svn='${can_use_svn}'")
***************
*** 153,172 ****
    )
  
!   # Live CVS / HEAD (no CVS_TAG):
!   #
!   set(proj KWStyle-CVSHEAD)
!   add_external_project(${proj}
!     CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
!     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"
!     DEPENDS "TutorialStep1-LocalNoDirTGZ"
!     DEPENDS "TutorialStep1-20081201"
!     DEPENDS "kwsys-from-CMake-2-6-2"
!   )
  endif()
  
--- 162,183 ----
    )
  
!   if(can_build_kwstyle)
!     # Live CVS / HEAD (no CVS_TAG):
!     #
!     set(proj KWStyle-CVSHEAD)
!     add_external_project(${proj}
!       CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
!       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"
!       DEPENDS "TutorialStep1-LocalNoDirTGZ"
!       DEPENDS "TutorialStep1-20081201"
!       DEPENDS "kwsys-from-CMake-2-6-2"
!     )
!   endif()
  endif()
  
***************
*** 243,248 ****
      "${build_dir}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1)
  
!   add_test(KWStyle-CVSHEAD-BuildTreeTest
!     "${build_dir}/KWStyle-CVSHEAD/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
  endif()
  
--- 254,261 ----
      "${build_dir}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1)
  
!   if(can_build_kwstyle)
!     add_test(KWStyle-CVSHEAD-BuildTreeTest
!       "${build_dir}/KWStyle-CVSHEAD/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
!   endif()
  endif()
  
***************
*** 265,270 ****
  
  if(can_use_cvs)
!   add_test(KWStyle-InstallTreeTest
!     "${install_dir}/bin/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
  endif()
  
--- 278,285 ----
  
  if(can_use_cvs)
!   if(can_build_kwstyle)
!     add_test(KWStyle-InstallTreeTest
!       "${install_dir}/bin/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
!   endif()
  endif()