[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.2 1.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Dec 5 15:18:34 EST 2008
Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv12770/Tests/ExternalProject
Modified Files:
CMakeLists.txt
Log Message:
ENH: Make it easier to use configure/make/make-install as the build steps for an external project. Add capability of customizing the download step. Add tests of empty projects. Better comments and error checking in AddExternalProject.cmake. In tests, use KWStyle from CVSHEAD to see if QNX continuous can build the latest KWStyle. Make KWStyle test depend on all previous test external projects so it builds last to catch other issues before any KWStyle compile errors.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeLists.txt 4 Dec 2008 20:30:37 -0000 1.2
--- CMakeLists.txt 5 Dec 2008 20:18:32 -0000 1.3
***************
*** 17,32 ****
include("${CMAKE_CURRENT_SOURCE_DIR}/TryCheckout.cmake")
! try_cvs_checkout(
! ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
! "CMake/Tests/Tutorial/Step1"
! "${CMAKE_CURRENT_BINARY_DIR}/TryCheckout/TutorialStep1"
! can_use_cvs
! )
! try_svn_checkout(
! "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
! "${CMAKE_CURRENT_BINARY_DIR}/TryCheckout/gdcmmd5"
! can_use_svn
! )
message(STATUS "can_use_cvs='${can_use_cvs}'")
--- 17,38 ----
include("${CMAKE_CURRENT_SOURCE_DIR}/TryCheckout.cmake")
! if(NOT DEFINED can_use_cvs)
! try_cvs_checkout(
! ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
! "CMake/Tests/Tutorial/Step1"
! "${CMAKE_CURRENT_BINARY_DIR}/TryCheckout/TutorialStep1"
! can_use_cvs
! )
! set(can_use_cvs ${can_use_cvs} CACHE STRING "Was try_cvs_checkout successful?")
! endif()
! if(NOT DEFINED can_use_svn)
! try_svn_checkout(
! "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
! "${CMAKE_CURRENT_BINARY_DIR}/TryCheckout/gdcmmd5"
! can_use_svn
! )
! set(can_use_svn ${can_use_svn} CACHE STRING "Was try_svn_checkout successful?")
! endif()
message(STATUS "can_use_cvs='${can_use_cvs}'")
***************
*** 34,37 ****
--- 40,78 ----
+ # Empty projects that test all the known add_external_project argument key words:
+ #
+ set(proj MinimalNoOpProject)
+ add_external_project(${proj}
+ BUILD_COMMAND ""
+ CONFIGURE_COMMAND ""
+ DOWNLOAD_COMMAND ""
+ INSTALL_COMMAND ""
+ )
+
+ set(proj EmptyNoOpProject)
+ add_external_project(${proj}
+ BUILD_ARGS ""
+ BUILD_COMMAND ""
+ CONFIGURE_ARGS ""
+ CONFIGURE_COMMAND ""
+ CONFIGURE_DIR ""
+ CVS_REPOSITORY ""
+ CVS_MODULE ""
+ CVS_TAG ""
+ DEPENDS "MinimalNoOpProject"
+ DIR ""
+ DOWNLOAD_ARGS ""
+ DOWNLOAD_COMMAND ""
+ INSTALL_ARGS ""
+ INSTALL_COMMAND ""
+ SVN_REPOSITORY ""
+ SVN_TAG ""
+ TAR ""
+ TAR_URL ""
+ TGZ ""
+ TGZ_URL ""
+ )
+
+
# Local DIR:
#
***************
*** 71,75 ****
set(proj TutorialStep1-LocalNoDirTGZ)
add_external_project(${proj}
! TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
INSTALL_COMMAND ""
--- 112,116 ----
set(proj TutorialStep1-LocalNoDirTGZ)
add_external_project(${proj}
! TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
INSTALL_COMMAND ""
***************
*** 92,101 ****
# CVS by date stamp:
#
! set(proj KWStyle-20081201)
add_external_project(${proj}
! CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
! CVS_MODULE "KWStyle"
CVS_TAG "-D\;2008-12-01 01:00:00 UTC"
CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
)
--- 133,143 ----
# CVS by date stamp:
#
! set(proj TutorialStep1-20081201)
add_external_project(${proj}
! CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
! CVS_MODULE "CMake/Tests/Tutorial/Step1"
CVS_TAG "-D\;2008-12-01 01:00:00 UTC"
CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
+ INSTALL_COMMAND ""
)
***************
*** 113,122 ****
# Live CVS / HEAD (no CVS_TAG):
#
! set(proj TutorialStep1-CVSHEAD)
add_external_project(${proj}
! CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
! CVS_MODULE "CMake/Tests/Tutorial/Step1"
CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
! INSTALL_COMMAND ""
)
endif()
--- 155,171 ----
# 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()
***************
*** 163,167 ****
# Use these as input to the KWStyle tests:
#
! set(kwstyleXmlFile "${source_dir}/KWStyle-20081201/Testing/Data/0001-KWStyleConfiguration.kws.xml")
set(header "${install_dir}/include/TutorialConfig.h")
--- 212,216 ----
# Use these as input to the KWStyle tests:
#
! set(kwstyleXmlFile "${source_dir}/KWStyle-CVSHEAD/Testing/Data/0001-KWStyleConfiguration.kws.xml")
set(header "${install_dir}/include/TutorialConfig.h")
***************
*** 188,199 ****
if(can_use_cvs)
! add_test(KWStyle-20081201-BuildTreeTest
! "${build_dir}/KWStyle-20081201/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
add_test(kwsys-from-CMake-2-6-2-BuildTreeTest
"${build_dir}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1)
! add_test(TutorialStep1-CVSHEAD-BuildTreeTest
! "${build_dir}/TutorialStep1-LocalNoDirTGZ/Tutorial" 4)
endif()
--- 237,248 ----
if(can_use_cvs)
! add_test(TutorialStep1-20081201-BuildTreeTest
! "${build_dir}/TutorialStep1-20081201/Tutorial" 4)
add_test(kwsys-from-CMake-2-6-2-BuildTreeTest
"${build_dir}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1)
! add_test(KWStyle-CVSHEAD-BuildTreeTest
! "${build_dir}/KWStyle-CVSHEAD/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
endif()
More information about the Cmake-commits
mailing list