[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.16 1.17
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jun 24 15:03:28 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv14888/Tests/ExternalProject
Modified Files:
CMakeLists.txt
Log Message:
ENH: New ExternalProject.cmake module interface
This creates new module ExternalProject.cmake to replace the prototype
AddExternalProject.cmake module. The interface is more refined, more
flexible, and better documented than the prototype.
This also converts the ExternalProject test to use the new module. The
old module will be removed (it was never in a CMake release) after
projects using it have been converted to the new module.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** CMakeLists.txt 9 Apr 2009 17:56:08 -0000 1.16
--- CMakeLists.txt 24 Jun 2009 19:03:26 -0000 1.17
***************
*** 2,12 ****
project(ExternalProjectTest NONE)
! include(AddExternalProject)
!
! get_external_project_directories(base_dir build_dir downloads_dir install_dir
! sentinels_dir source_dir tmp_dir)
!
! set(prefix "${install_dir}")
# Use a "TryCheckout" technique on small subtrees of certain projects
--- 2,10 ----
project(ExternalProjectTest NONE)
! include(ExternalProject)
+ set(base "${CMAKE_BINARY_DIR}/CMakeExternals")
+ set(binary_base "${base}/Build")
+ set_property(DIRECTORY PROPERTY EP_BASE ${base})
# Use a "TryCheckout" technique on small subtrees of certain projects
***************
*** 34,38 ****
#
if(CMAKE_SYSTEM STREQUAL "Windows-4.10")
! string(LENGTH "${build_dir}/TutorialStep5-Local" n)
if(n GREATER 72)
set(can_build_tutorial_step5 0)
--- 32,36 ----
#
if(CMAKE_SYSTEM STREQUAL "Windows-4.10")
! string(LENGTH "${binary_base}/TutorialStep5-Local" n)
if(n GREATER 72)
set(can_build_tutorial_step5 0)
***************
*** 66,73 ****
! # Empty projects that test all the known add_external_project argument key words:
#
set(proj MinimalNoOpProject)
! add_external_project(${proj}
BUILD_COMMAND ""
CONFIGURE_COMMAND ""
--- 64,71 ----
! # Empty projects that test all the known ep_add argument key words:
#
set(proj MinimalNoOpProject)
! ep_add(${proj}
BUILD_COMMAND ""
CONFIGURE_COMMAND ""
***************
*** 77,101 ****
set(proj EmptyNoOpProject)
! add_external_project(${proj}
! BUILD_ARGS ""
BUILD_COMMAND ""
CMAKE_ARGS ""
CONFIGURE_COMMAND ""
- CONFIGURE_DIR ""
CVS_REPOSITORY ""
CVS_MODULE ""
CVS_TAG ""
DEPENDS "MinimalNoOpProject"
- DIR ""
DOWNLOAD_COMMAND ""
- INSTALL_ARGS ""
INSTALL_COMMAND ""
PATCH_COMMAND ""
SVN_REPOSITORY ""
SVN_TAG ""
! TAR ""
! TAR_URL ""
! TGZ ""
! TGZ_URL ""
UPDATE_COMMAND ""
)
--- 75,92 ----
set(proj EmptyNoOpProject)
! ep_add(${proj}
BUILD_COMMAND ""
CMAKE_ARGS ""
CONFIGURE_COMMAND ""
CVS_REPOSITORY ""
CVS_MODULE ""
CVS_TAG ""
DEPENDS "MinimalNoOpProject"
DOWNLOAD_COMMAND ""
INSTALL_COMMAND ""
PATCH_COMMAND ""
SVN_REPOSITORY ""
SVN_TAG ""
! URL ""
UPDATE_COMMAND ""
)
***************
*** 106,113 ****
if(can_build_tutorial_step5)
set(proj TutorialStep5-Local)
! add_external_project(${proj}
! DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
)
endif()
--- 97,106 ----
if(can_build_tutorial_step5)
set(proj TutorialStep5-Local)
! ep_add(${proj}
! URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
)
+ ep_get(${proj} install_dir)
+ set(TutorialStep5_install_dir ${install_dir})
endif()
***************
*** 116,125 ****
#
set(proj TutorialStep1-LocalTAR)
! add_external_project(${proj}
! TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
LIST_SEPARATOR ::
PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
-DTEST_LIST:STRING=A::B::C
INSTALL_COMMAND ""
--- 109,118 ----
#
set(proj TutorialStep1-LocalTAR)
! ep_add(${proj}
! URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
LIST_SEPARATOR ::
PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DTEST_LIST:STRING=A::B::C
INSTALL_COMMAND ""
***************
*** 127,141 ****
set(proj TutorialStep1-LocalNoDirTAR)
! add_external_project(${proj}
! TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
LIST_SEPARATOR @@
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
-DTEST_LIST:STRING=1@@2@@3
INSTALL_COMMAND ""
)
! add_external_project_step(${proj} mypatch
COMMAND ${CMAKE_COMMAND} -E echo "This is a custom external project step."
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
! WORKING_DIRECTORY ${source_dir}/TutorialStep1-LocalNoDirTAR
DEPENDEES download
DEPENDERS configure
--- 120,134 ----
set(proj TutorialStep1-LocalNoDirTAR)
! ep_add(${proj}
! URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
LIST_SEPARATOR @@
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
-DTEST_LIST:STRING=1@@2@@3
INSTALL_COMMAND ""
)
! ep_add_step(${proj} mypatch
COMMAND ${CMAKE_COMMAND} -E echo "This is a custom external project step."
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
! WORKING_DIRECTORY <SOURCE_DIR>
DEPENDEES download
DEPENDERS configure
***************
*** 146,160 ****
#
set(proj TutorialStep1-LocalTGZ)
! add_external_project(${proj}
! TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
INSTALL_COMMAND ""
)
set(proj TutorialStep1-LocalNoDirTGZ)
! add_external_project(${proj}
! TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
INSTALL_COMMAND ""
)
--- 139,153 ----
#
set(proj TutorialStep1-LocalTGZ)
! ep_add(${proj}
! URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
INSTALL_COMMAND ""
)
set(proj TutorialStep1-LocalNoDirTGZ)
! ep_add(${proj}
! URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
)
***************
*** 177,186 ****
#
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 "-D2008-12-01 01:00:00 UTC"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
INSTALL_COMMAND ""
)
--- 170,179 ----
#
set(proj TutorialStep1-20081201)
! ep_add(${proj}
CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
CVS_MODULE "CMake/Tests/Tutorial/Step1"
CVS_TAG "-D2008-12-01 01:00:00 UTC"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
)
***************
*** 189,198 ****
#
set(proj kwsys-from-CMake-2-6-2)
! add_external_project(${proj}
CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
CVS_MODULE "CMake/Source/kwsys"
CVS_TAG -rCMake-2-6-2
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
INSTALL_COMMAND ""
)
--- 182,191 ----
#
set(proj kwsys-from-CMake-2-6-2)
! ep_add(${proj}
CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
CVS_MODULE "CMake/Source/kwsys"
CVS_TAG -rCMake-2-6-2
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
)
***************
*** 202,210 ****
#
set(proj KWStyle-CVSHEAD)
! add_external_project(${proj}
CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
CVS_MODULE "KWStyle"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
DEPENDS "EmptyNoOpProject"
DEPENDS "TutorialStep1-LocalTAR"
--- 195,203 ----
#
set(proj KWStyle-CVSHEAD)
! ep_add(${proj}
CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
CVS_MODULE "KWStyle"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
DEPENDS "EmptyNoOpProject"
DEPENDS "TutorialStep1-LocalTAR"
***************
*** 215,218 ****
--- 208,214 ----
DEPENDS "kwsys-from-CMake-2-6-2"
)
+ ep_get(${proj} source_dir install_dir)
+ set(kwstyle_source_dir ${source_dir})
+ set(kwstyle_install_dir ${install_dir})
endif()
endif()
***************
*** 225,243 ****
#
set(proj gdcm-md5-20081204)
! add_external_project(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
SVN_TAG "-r{2008-12-04 01:00:00 +0000}"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
)
# SVN by revision number:
#
set(proj gdcm-md5-r4824)
! add_external_project(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
SVN_TAG "-r4824"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
INSTALL_COMMAND ""
)
--- 221,241 ----
#
set(proj gdcm-md5-20081204)
! ep_add(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
SVN_TAG "-r{2008-12-04 01:00:00 +0000}"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
)
+ ep_get(${proj} install_dir)
+ set(gdcm_install_dir ${install_dir})
# SVN by revision number:
#
set(proj gdcm-md5-r4824)
! ep_add(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
SVN_TAG "-r4824"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
)
***************
*** 246,253 ****
#
set(proj gdcm-md5-SVNtrunk)
! add_external_project(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
INSTALL_COMMAND ""
)
--- 244,251 ----
#
set(proj gdcm-md5-SVNtrunk)
! ep_add(${proj}
SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
! CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
INSTALL_COMMAND ""
)
***************
*** 262,267 ****
# 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")
--- 260,265 ----
# Use these as input to the KWStyle tests:
#
! set(kwstyleXmlFile "${kwstyle_source_dir}/Testing/Data/0001-KWStyleConfiguration.kws.xml")
! set(header "${TutorialStep5_install_dir}/include/TutorialConfig.h")
***************
*** 273,301 ****
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/EP-Tutorial" 36)
add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest
! "${build_dir}/TutorialStep1-LocalNoDirTAR/EP-Tutorial" 25)
add_test(TutorialStep1-LocalTGZ-BuildTreeTest
! "${build_dir}/TutorialStep1-LocalTGZ/Tutorial" 16)
add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest
! "${build_dir}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
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)
if(can_build_kwstyle)
add_test(KWStyle-CVSHEAD-BuildTreeTest
! "${build_dir}/KWStyle-CVSHEAD/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
endif()
endif()
--- 271,299 ----
if(can_build_tutorial_step5)
add_test(TutorialStep5-Local-BuildTreeTest
! "${binary_base}/TutorialStep5-Local/Tutorial" 42)
endif()
add_test(TutorialStep1-LocalTAR-BuildTreeTest
! "${binary_base}/TutorialStep1-LocalTAR/EP-Tutorial" 36)
add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest
! "${binary_base}/TutorialStep1-LocalNoDirTAR/EP-Tutorial" 25)
add_test(TutorialStep1-LocalTGZ-BuildTreeTest
! "${binary_base}/TutorialStep1-LocalTGZ/Tutorial" 16)
add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest
! "${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
if(can_use_cvs)
add_test(TutorialStep1-20081201-BuildTreeTest
! "${binary_base}/TutorialStep1-20081201/Tutorial" 4)
add_test(kwsys-from-CMake-2-6-2-BuildTreeTest
! "${binary_base}/kwsys-from-CMake-2-6-2/kwsysTestProcess" 1)
if(can_build_kwstyle)
add_test(KWStyle-CVSHEAD-BuildTreeTest
! "${binary_base}/KWStyle-CVSHEAD/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
endif()
endif()
***************
*** 303,313 ****
if(can_use_svn)
add_test(gdcm-md5-20081204-BuildTreeTest
! "${build_dir}/gdcm-md5-20081204/md5main" --version)
add_test(gdcm-md5-r4824-BuildTreeTest
! "${build_dir}/gdcm-md5-r4824/md5main" --version)
add_test(gdcm-md5-SVNtrunk-BuildTreeTest
! "${build_dir}/gdcm-md5-SVNtrunk/md5main" --version)
endif()
--- 301,311 ----
if(can_use_svn)
add_test(gdcm-md5-20081204-BuildTreeTest
! "${binary_base}/gdcm-md5-20081204/md5main" --version)
add_test(gdcm-md5-r4824-BuildTreeTest
! "${binary_base}/gdcm-md5-r4824/md5main" --version)
add_test(gdcm-md5-SVNtrunk-BuildTreeTest
! "${binary_base}/gdcm-md5-SVNtrunk/md5main" --version)
endif()
***************
*** 317,321 ****
if(can_build_tutorial_step5)
add_test(TutorialStep5-InstallTreeTest
! "${install_dir}/bin/Tutorial" 49)
endif()
--- 315,319 ----
if(can_build_tutorial_step5)
add_test(TutorialStep5-InstallTreeTest
! "${TutorialStep5_install_dir}/bin/Tutorial" 49)
endif()
***************
*** 323,327 ****
if(can_build_kwstyle)
add_test(KWStyle-InstallTreeTest
! "${install_dir}/bin/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
endif()
endif()
--- 321,325 ----
if(can_build_kwstyle)
add_test(KWStyle-InstallTreeTest
! "${kwstyle_install_dir}/bin/KWStyle" -xml "${kwstyleXmlFile}" "${header}")
endif()
endif()
***************
*** 329,332 ****
if(can_use_svn)
add_test(gdcm-md5-InstallTreeTest
! "${install_dir}/bin/md5main" --version)
endif()
--- 327,330 ----
if(can_use_svn)
add_test(gdcm-md5-InstallTreeTest
! "${gdcm_install_dir}/bin/md5main" --version)
endif()
More information about the Cmake-commits
mailing list