[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.23 1.24
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Sep 8 15:37:17 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv28105/Tests/ExternalProject
Modified Files:
CMakeLists.txt
Log Message:
Use more verbose/descriptive names for the "public API" functions in the ExternalProject.cmake module. Follow the cmake function naming convention, using a ModuleFileName_ prefix. Locate stamp files under a CMAKE_CFG_INTDIR subdir of the stamp dir so that debug and release builds have separate stamp files for Visual Studio builds. If no CMAKE_GENERATOR argument is given to ExternalProject_Add, default to using the parent project's cmake generator.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** CMakeLists.txt 3 Sep 2009 16:11:14 -0000 1.23
--- CMakeLists.txt 8 Sep 2009 19:37:15 -0000 1.24
***************
*** 30,37 ****
! # Empty projects that test all the known ep_add argument key words:
#
set(proj MinimalNoOpProject)
! ep_add(${proj}
BUILD_COMMAND ""
CONFIGURE_COMMAND ""
--- 30,37 ----
! # Empty projects that test all the known ExternalProject_Add argument key words:
#
set(proj MinimalNoOpProject)
! ExternalProject_Add(${proj}
BUILD_COMMAND ""
CONFIGURE_COMMAND ""
***************
*** 41,45 ****
set(proj EmptyNoOpProject)
! ep_add(${proj}
BUILD_COMMAND ""
CMAKE_ARGS ""
--- 41,45 ----
set(proj EmptyNoOpProject)
! ExternalProject_Add(${proj}
BUILD_COMMAND ""
CMAKE_ARGS ""
***************
*** 64,77 ****
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>
TEST_BEFORE_INSTALL 1
)
! ep_get(${proj} install_dir)
set(TutorialStep5_install_dir ${install_dir})
set(proj TutorialStep5-Local-TestAfterInstall)
! ep_add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
--- 64,77 ----
if(can_build_tutorial_step5)
set(proj TutorialStep5-Local)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
TEST_BEFORE_INSTALL 1
)
! ExternalProject_Get_Property(${proj} install_dir)
set(TutorialStep5_install_dir ${install_dir})
set(proj TutorialStep5-Local-TestAfterInstall)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
***************
*** 84,88 ****
#
set(proj TutorialStep1-LocalTAR)
! ep_add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
LIST_SEPARATOR ::
--- 84,88 ----
#
set(proj TutorialStep1-LocalTAR)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
LIST_SEPARATOR ::
***************
*** 95,99 ****
set(proj TutorialStep1-LocalNoDirTAR)
! ep_add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
LIST_SEPARATOR @@
--- 95,99 ----
set(proj TutorialStep1-LocalNoDirTAR)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
LIST_SEPARATOR @@
***************
*** 102,106 ****
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
--- 102,106 ----
INSTALL_COMMAND ""
)
! ExternalProject_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
***************
*** 114,118 ****
#
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>
--- 114,118 ----
#
set(proj TutorialStep1-LocalTGZ)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
***************
*** 121,125 ****
set(proj TutorialStep1-LocalNoDirTGZ)
! ep_add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
--- 121,125 ----
set(proj TutorialStep1-LocalNoDirTGZ)
! ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
***************
*** 144,152 ****
if(do_cvs_tests)
# Unzip/untar the CVS repository in our source folder so that other
! # projects below may use it to test CVS args of ep_add
#
set(proj SetupLocalCVSRepository)
set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS")
! ep_add(${proj}
SOURCE_DIR ${local_cvs_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
--- 144,152 ----
if(do_cvs_tests)
# Unzip/untar the CVS repository in our source folder so that other
! # projects below may use it to test CVS args of ExternalProject_Add
#
set(proj SetupLocalCVSRepository)
set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS")
! ExternalProject_Add(${proj}
SOURCE_DIR ${local_cvs_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
***************
*** 159,163 ****
#
set(proj TutorialStep1-CVS-20090626)
! ep_add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
--- 159,163 ----
#
set(proj TutorialStep1-CVS-20090626)
! ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
***************
*** 173,177 ****
#
set(proj TutorialStep1-CVS-testtag1)
! ep_add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
--- 173,177 ----
#
set(proj TutorialStep1-CVS-testtag1)
! ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
***************
*** 187,191 ****
#
set(proj TutorialStep1-CVS-HEAD)
! ep_add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
--- 187,191 ----
#
set(proj TutorialStep1-CVS-HEAD)
! ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1"
***************
*** 239,248 ****
if(do_svn_tests)
# Unzip/untar the SVN repository in our source folder so that other
! # projects below may use it to test SVN args of ep_add
#
set(proj SetupLocalSVNRepository)
set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN")
set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1")
! ep_add(${proj}
SOURCE_DIR ${local_svn_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
--- 239,248 ----
if(do_svn_tests)
# Unzip/untar the SVN repository in our source folder so that other
! # projects below may use it to test SVN args of ExternalProject_Add
#
set(proj SetupLocalSVNRepository)
set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN")
set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1")
! ExternalProject_Add(${proj}
SOURCE_DIR ${local_svn_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
***************
*** 255,259 ****
#
set(proj TutorialStep1-SVN-20090626)
! ep_add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r{2009-06-26 16:50:00 +0000}"
--- 255,259 ----
#
set(proj TutorialStep1-SVN-20090626)
! ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r{2009-06-26 16:50:00 +0000}"
***************
*** 268,272 ****
#
set(proj TutorialStep1-SVN-r2)
! ep_add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r2"
--- 268,272 ----
#
set(proj TutorialStep1-SVN-r2)
! ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r2"
***************
*** 281,285 ****
#
set(proj TutorialStep1-SVN-trunk)
! ep_add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
--- 281,285 ----
#
set(proj TutorialStep1-SVN-trunk)
! ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
***************
*** 304,311 ****
--- 304,315 ----
add_test(TutorialStep5-Local-BuildTreeTest
"${binary_base}/TutorialStep5-Local/Tutorial" 42)
+ set_property(TEST TutorialStep5-Local-BuildTreeTest
+ APPEND PROPERTY LABELS Step5 BuildTree)
endif()
add_test(TutorialStep1-LocalTAR-BuildTreeTest
"${binary_base}/TutorialStep1-LocalTAR/EP-Tutorial" 36)
+ set_property(TEST TutorialStep1-LocalTAR-BuildTreeTest
+ APPEND PROPERTY LABELS TAR)
add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest
***************
*** 314,317 ****
--- 318,323 ----
add_test(TutorialStep1-LocalTGZ-BuildTreeTest
"${binary_base}/TutorialStep1-LocalTGZ/Tutorial" 16)
+ set_property(TEST TutorialStep1-LocalTGZ-BuildTreeTest
+ APPEND PROPERTY LABELS TGZ)
add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest
***************
*** 346,348 ****
--- 352,356 ----
add_test(TutorialStep5-InstallTreeTest
"${TutorialStep5_install_dir}/bin/Tutorial" 49)
+ set_property(TEST TutorialStep5-InstallTreeTest
+ APPEND PROPERTY LABELS Step5 InstallTree)
endif()
More information about the Cmake-commits
mailing list