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.

This commit is contained in:
David Cole 2009-09-08 15:37:15 -04:00
parent 6727834a8c
commit 002ae925c3
2 changed files with 92 additions and 78 deletions

View File

@ -1,8 +1,8 @@
# - Create custom targets to build projects in external trees # - Create custom targets to build projects in external trees
# The 'ep_add' function creates a custom target to drive download, # The 'ExternalProject_Add' function creates a custom target to drive
# update/patch, configure, build, and install steps of an external # download, update/patch, configure, build, install and test steps of an
# project: # external project:
# ep_add(<name> # Name for custom target # ExternalProject_Add(<name> # Name for custom target
# [DEPENDS projects...] # Targets on which the project depends # [DEPENDS projects...] # Targets on which the project depends
# [PREFIX dir] # Root dir for entire project # [PREFIX dir] # Root dir for entire project
# [LIST_SEPARATOR sep] # Sep to be replaced by ; in cmd lines # [LIST_SEPARATOR sep] # Sep to be replaced by ; in cmd lines
@ -40,8 +40,8 @@
# ) # )
# The *_DIR options specify directories for the project, with default # The *_DIR options specify directories for the project, with default
# directories computed as follows. # directories computed as follows.
# If the PREFIX option is given to ep_add() or the EP_PREFIX directory # If the PREFIX option is given to ExternalProject_Add() or the EP_PREFIX
# property is set, then an external project is built and installed # directory property is set, then an external project is built and installed
# under the specified prefix: # under the specified prefix:
# TMP_DIR = <prefix>/tmp # TMP_DIR = <prefix>/tmp
# STAMP_DIR = <prefix>/src/<name>-stamp # STAMP_DIR = <prefix>/src/<name>-stamp
@ -60,7 +60,8 @@
# If no PREFIX, EP_PREFIX, or EP_BASE is specified then the default # If no PREFIX, EP_PREFIX, or EP_BASE is specified then the default
# is to set PREFIX to "<name>-prefix". # is to set PREFIX to "<name>-prefix".
# Relative paths are interpreted with respect to the build directory # Relative paths are interpreted with respect to the build directory
# corresponding to the source directory in which ep_add is invoked. # corresponding to the source directory in which ExternalProject_Add is
# invoked.
# #
# If SOURCE_DIR is explicitly set to an existing directory the project # If SOURCE_DIR is explicitly set to an existing directory the project
# will be built from it. # will be built from it.
@ -69,8 +70,9 @@
# The URL option may refer locally to a directory or source tarball, # The URL option may refer locally to a directory or source tarball,
# or refer to a remote tarball (e.g. http://.../src.tgz). # or refer to a remote tarball (e.g. http://.../src.tgz).
# #
# The 'ep_add_step' function adds a custom steps to an external project: # The 'ExternalProject_Add_Step' function adds a custom step to an external
# ep_add_step(<name> <step> # Names of project and custom step # project:
# ExternalProject_Add_Step(<name> <step> # Names of project and custom step
# [COMMAND cmd...] # Command line invoked by this step # [COMMAND cmd...] # Command line invoked by this step
# [COMMENT "text..."] # Text printed when step executes # [COMMENT "text..."] # Text printed when step executes
# [DEPENDEES steps...] # Steps on which this step depends # [DEPENDEES steps...] # Steps on which this step depends
@ -87,21 +89,23 @@
# and <TMP_DIR> # and <TMP_DIR>
# with corresponding property values. # with corresponding property values.
# #
# The 'ep_get' function retrieves external project target properties: # The 'ExternalProject_Get_Property' function retrieves external project
# ep_get(<name> [prop1 [prop2 [...]]]) # target properties:
# ExternalProject_Get_Property(<name> [prop1 [prop2 [...]]])
# It stores property values in variables of the same name. # It stores property values in variables of the same name.
# Property names correspond to the keyword argument names of 'ep_add'. # Property names correspond to the keyword argument names of
# 'ExternalProject_Add'.
# Pre-compute a regex to match documented keywords for each command. # Pre-compute a regex to match documented keywords for each command.
file(STRINGS "${CMAKE_CURRENT_LIST_FILE}" lines LIMIT_COUNT 100 file(STRINGS "${CMAKE_CURRENT_LIST_FILE}" lines LIMIT_COUNT 100
REGEX "^# ( \\[[A-Z_]+ [^]]*\\] +#.*$|[a-z_]+\\()") REGEX "^# ( \\[[A-Z_]+ [^]]*\\] +#.*$|[A-Za-z_]+\\()")
foreach(line IN LISTS lines) foreach(line IN LISTS lines)
if("${line}" MATCHES "^# [a-z_]+\\(") if("${line}" MATCHES "^# [A-Za-z_]+\\(")
if(_ep_func) if(_ep_func)
set(_ep_keywords_${_ep_func} "${_ep_keywords_${_ep_func}})$") set(_ep_keywords_${_ep_func} "${_ep_keywords_${_ep_func}})$")
endif() endif()
string(REGEX REPLACE "^# ([a-z_]+)\\(.*" "\\1" _ep_func "${line}") string(REGEX REPLACE "^# ([A-Za-z_]+)\\(.*" "\\1" _ep_func "${line}")
#message("function [${_ep_func}]") #message("function [${_ep_func}]")
set(_ep_keywords_${_ep_func} "^(") set(_ep_keywords_${_ep_func} "^(")
set(_ep_keyword_sep) set(_ep_keyword_sep)
@ -174,14 +178,14 @@ endfunction(_ep_parse_arguments)
define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED
BRIEF_DOCS "Base directory for External Project storage." BRIEF_DOCS "Base directory for External Project storage."
FULL_DOCS FULL_DOCS
"See documentation of the ep_add() function in the " "See documentation of the ExternalProject_Add() function in the "
"ExternalProject module." "ExternalProject module."
) )
define_property(DIRECTORY PROPERTY "EP_PREFIX" INHERITED define_property(DIRECTORY PROPERTY "EP_PREFIX" INHERITED
BRIEF_DOCS "Top prefix for External Project storage." BRIEF_DOCS "Top prefix for External Project storage."
FULL_DOCS FULL_DOCS
"See documentation of the ep_add() function in the " "See documentation of the ExternalProject_Add() function in the "
"ExternalProject module." "ExternalProject module."
) )
@ -371,7 +375,7 @@ function(_ep_set_directories name)
endfunction(_ep_set_directories) endfunction(_ep_set_directories)
function(ep_get name) function(ExternalProject_Get_Property name)
foreach(var ${ARGN}) foreach(var ${ARGN})
string(TOUPPER "${var}" VAR) string(TOUPPER "${var}" VAR)
get_property(${var} TARGET ${name} PROPERTY _EP_${VAR}) get_property(${var} TARGET ${name} PROPERTY _EP_${VAR})
@ -380,7 +384,7 @@ function(ep_get name)
endif() endif()
set(${var} "${${var}}" PARENT_SCOPE) set(${var} "${${var}}" PARENT_SCOPE)
endforeach() endforeach()
endfunction(ep_get) endfunction(ExternalProject_Get_Property)
function(_ep_get_configure_command_id name cfg_cmd_id_var) function(_ep_get_configure_command_id name cfg_cmd_id_var)
@ -469,23 +473,23 @@ function(_ep_get_build_command name step cmd_var)
endfunction(_ep_get_build_command) endfunction(_ep_get_build_command)
function(ep_add_step name step) function(ExternalProject_Add_Step name step)
set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles) set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
ep_get(${name} stamp_dir) ExternalProject_Get_Property(${name} stamp_dir)
add_custom_command(APPEND add_custom_command(APPEND
OUTPUT ${cmf_dir}/${name}-complete OUTPUT ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete
DEPENDS ${stamp_dir}/${name}-${step} DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step}
) )
_ep_parse_arguments(ep_add_step _ep_parse_arguments(ExternalProject_Add_Step
${name} _EP_${step}_ "${ARGN}") ${name} _EP_${step}_ "${ARGN}")
# Steps depending on this step. # Steps depending on this step.
get_property(dependers TARGET ${name} PROPERTY _EP_${step}_DEPENDERS) get_property(dependers TARGET ${name} PROPERTY _EP_${step}_DEPENDERS)
foreach(depender IN LISTS dependers) foreach(depender IN LISTS dependers)
add_custom_command(APPEND add_custom_command(APPEND
OUTPUT ${stamp_dir}/${name}-${depender} OUTPUT ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${depender}
DEPENDS ${stamp_dir}/${name}-${step} DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step}
) )
endforeach() endforeach()
@ -495,7 +499,7 @@ function(ep_add_step name step)
# Dependencies on steps. # Dependencies on steps.
get_property(dependees TARGET ${name} PROPERTY _EP_${step}_DEPENDEES) get_property(dependees TARGET ${name} PROPERTY _EP_${step}_DEPENDEES)
foreach(dependee IN LISTS dependees) foreach(dependee IN LISTS dependees)
list(APPEND depends ${stamp_dir}/${name}-${dependee}) list(APPEND depends ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${dependee})
endforeach() endforeach()
# The command to run. # The command to run.
@ -532,14 +536,14 @@ function(ep_add_step name step)
# Run every time? # Run every time?
get_property(always TARGET ${name} PROPERTY _EP_${step}_ALWAYS) get_property(always TARGET ${name} PROPERTY _EP_${step}_ALWAYS)
if(always) if(always)
set_property(SOURCE ${stamp_dir}/${name}-${step} PROPERTY SYMBOLIC 1) set_property(SOURCE ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step} PROPERTY SYMBOLIC 1)
set(touch) set(touch)
else() else()
set(touch ${CMAKE_COMMAND} -E touch ${stamp_dir}/${name}-${step}) set(touch ${CMAKE_COMMAND} -E touch ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step})
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${stamp_dir}/${name}-${step} OUTPUT ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-${step}
COMMENT ${comment} COMMENT ${comment}
COMMAND ${command} COMMAND ${command}
COMMAND ${touch} COMMAND ${touch}
@ -547,13 +551,13 @@ function(ep_add_step name step)
WORKING_DIRECTORY ${work_dir} WORKING_DIRECTORY ${work_dir}
VERBATIM VERBATIM
) )
endfunction(ep_add_step) endfunction(ExternalProject_Add_Step)
function(_ep_add_mkdir_command name) function(_ep_add_mkdir_command name)
ep_get(${name} ExternalProject_Get_Property(${name}
source_dir binary_dir install_dir stamp_dir download_dir tmp_dir) source_dir binary_dir install_dir stamp_dir download_dir tmp_dir)
ep_add_step(${name} mkdir ExternalProject_Add_Step(${name} mkdir
COMMENT "Creating directories for '${name}'" COMMENT "Creating directories for '${name}'"
COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${binary_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${binary_dir}
@ -566,7 +570,7 @@ endfunction(_ep_add_mkdir_command)
function(_ep_add_download_command name) function(_ep_add_download_command name)
ep_get(${name} source_dir stamp_dir download_dir tmp_dir) ExternalProject_Get_Property(${name} source_dir stamp_dir download_dir tmp_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND SET)
get_property(cmd TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND) get_property(cmd TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND)
@ -672,7 +676,7 @@ function(_ep_add_download_command name)
message(SEND_ERROR "error: no download info for '${name}'") message(SEND_ERROR "error: no download info for '${name}'")
endif() endif()
ep_add_step(${name} download ExternalProject_Add_Step(${name} download
COMMENT ${comment} COMMENT ${comment}
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${work_dir} WORKING_DIRECTORY ${work_dir}
@ -683,7 +687,7 @@ endfunction(_ep_add_download_command)
function(_ep_add_update_command name) function(_ep_add_update_command name)
ep_get(${name} source_dir) ExternalProject_Get_Property(${name} source_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_UPDATE_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_UPDATE_COMMAND SET)
get_property(cmd TARGET ${name} PROPERTY _EP_UPDATE_COMMAND) get_property(cmd TARGET ${name} PROPERTY _EP_UPDATE_COMMAND)
@ -716,7 +720,7 @@ function(_ep_add_update_command name)
set(always 1) set(always 1)
endif() endif()
ep_add_step(${name} update ExternalProject_Add_Step(${name} update
COMMENT ${comment} COMMENT ${comment}
COMMAND ${cmd} COMMAND ${cmd}
ALWAYS ${always} ALWAYS ${always}
@ -727,7 +731,7 @@ endfunction(_ep_add_update_command)
function(_ep_add_patch_command name) function(_ep_add_patch_command name)
ep_get(${name} source_dir) ExternalProject_Get_Property(${name} source_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_PATCH_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_PATCH_COMMAND SET)
get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND) get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND)
@ -738,7 +742,7 @@ function(_ep_add_patch_command name)
set(work_dir ${source_dir}) set(work_dir ${source_dir})
endif() endif()
ep_add_step(${name} patch ExternalProject_Add_Step(${name} patch
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${work_dir} WORKING_DIRECTORY ${work_dir}
DEPENDEES download DEPENDEES download
@ -748,14 +752,14 @@ endfunction(_ep_add_patch_command)
# TODO: Make sure external projects use the proper compiler # TODO: Make sure external projects use the proper compiler
function(_ep_add_configure_command name) function(_ep_add_configure_command name)
ep_get(${name} source_dir binary_dir) ExternalProject_Get_Property(${name} source_dir binary_dir)
# Depend on other external projects (file-level). # Depend on other external projects (file-level).
set(file_deps) set(file_deps)
get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
foreach(dep IN LISTS deps) foreach(dep IN LISTS deps)
get_property(dep_stamp_dir TARGET ${dep} PROPERTY _EP_STAMP_DIR) get_property(dep_stamp_dir TARGET ${dep} PROPERTY _EP_STAMP_DIR)
list(APPEND file_deps ${dep_stamp_dir}/${dep}-done) list(APPEND file_deps ${dep_stamp_dir}/${CMAKE_CFG_INTDIR}/${dep}-done)
endforeach() endforeach()
get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET)
@ -775,10 +779,12 @@ function(_ep_add_configure_command name)
get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR) get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
if(cmake_generator) if(cmake_generator)
list(APPEND cmd "-G${cmake_generator}" "${source_dir}") list(APPEND cmd "-G${cmake_generator}" "${source_dir}")
else()
list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}")
endif() endif()
endif() endif()
ep_add_step(${name} configure ExternalProject_Add_Step(${name} configure
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir} WORKING_DIRECTORY ${binary_dir}
DEPENDEES update patch DEPENDEES update patch
@ -788,7 +794,7 @@ endfunction(_ep_add_configure_command)
function(_ep_add_build_command name) function(_ep_add_build_command name)
ep_get(${name} binary_dir) ExternalProject_Get_Property(${name} binary_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_BUILD_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_BUILD_COMMAND SET)
if(cmd_set) if(cmd_set)
@ -797,7 +803,7 @@ function(_ep_add_build_command name)
_ep_get_build_command(${name} BUILD cmd) _ep_get_build_command(${name} BUILD cmd)
endif() endif()
ep_add_step(${name} build ExternalProject_Add_Step(${name} build
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir} WORKING_DIRECTORY ${binary_dir}
DEPENDEES configure DEPENDEES configure
@ -806,7 +812,7 @@ endfunction(_ep_add_build_command)
function(_ep_add_install_command name) function(_ep_add_install_command name)
ep_get(${name} binary_dir) ExternalProject_Get_Property(${name} binary_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_INSTALL_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_INSTALL_COMMAND SET)
if(cmd_set) if(cmd_set)
@ -815,7 +821,7 @@ function(_ep_add_install_command name)
_ep_get_build_command(${name} INSTALL cmd) _ep_get_build_command(${name} INSTALL cmd)
endif() endif()
ep_add_step(${name} install ExternalProject_Add_Step(${name} install
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir} WORKING_DIRECTORY ${binary_dir}
DEPENDEES build DEPENDEES build
@ -824,7 +830,7 @@ endfunction(_ep_add_install_command)
function(_ep_add_test_command name) function(_ep_add_test_command name)
ep_get(${name} binary_dir) ExternalProject_Get_Property(${name} binary_dir)
get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL) get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL)
get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL) get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL)
@ -846,7 +852,7 @@ function(_ep_add_test_command name)
set(dep_args DEPENDEES install) set(dep_args DEPENDEES install)
endif() endif()
ep_add_step(${name} test ExternalProject_Add_Step(${name} test
COMMAND ${cmd} COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir} WORKING_DIRECTORY ${binary_dir}
${dep_args} ${dep_args}
@ -855,14 +861,14 @@ function(_ep_add_test_command name)
endfunction(_ep_add_test_command) endfunction(_ep_add_test_command)
function(ep_add name) function(ExternalProject_Add name)
# Add a custom target for the external project. # Add a custom target for the external project.
set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles) set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
add_custom_target(${name} ALL DEPENDS ${cmf_dir}/${name}-complete) add_custom_target(${name} ALL DEPENDS ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete)
set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1) set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
_ep_parse_arguments(ep_add ${name} _EP_ "${ARGN}") _ep_parse_arguments(ExternalProject_Add ${name} _EP_ "${ARGN}")
_ep_set_directories(${name}) _ep_set_directories(${name})
ep_get(${name} stamp_dir) ExternalProject_Get_Property(${name} stamp_dir)
# The 'complete' step depends on all other steps and creates a # The 'complete' step depends on all other steps and creates a
# 'done' mark. A dependent external project's 'configure' step # 'done' mark. A dependent external project's 'configure' step
@ -871,11 +877,11 @@ function(ep_add name)
# custom command so that CMake does not propagate build rules to # custom command so that CMake does not propagate build rules to
# other external project targets. # other external project targets.
add_custom_command( add_custom_command(
OUTPUT ${cmf_dir}/${name}-complete OUTPUT ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete
COMMENT "Completed '${name}'" COMMENT "Completed '${name}'"
COMMAND ${CMAKE_COMMAND} -E touch ${cmf_dir}/${name}-complete COMMAND ${CMAKE_COMMAND} -E touch ${cmf_dir}/${CMAKE_CFG_INTDIR}/${name}-complete
COMMAND ${CMAKE_COMMAND} -E touch ${stamp_dir}/${name}-done COMMAND ${CMAKE_COMMAND} -E touch ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-done
DEPENDS ${stamp_dir}/${name}-install DEPENDS ${stamp_dir}/${CMAKE_CFG_INTDIR}/${name}-install
VERBATIM VERBATIM
) )
@ -904,4 +910,4 @@ function(ep_add name)
# on install. # on install.
# #
_ep_add_test_command(${name}) _ep_add_test_command(${name})
endfunction(ep_add) endfunction(ExternalProject_Add)

View File

@ -29,10 +29,10 @@ endif()
message(STATUS "can_build_tutorial_step5='${can_build_tutorial_step5}'") message(STATUS "can_build_tutorial_step5='${can_build_tutorial_step5}'")
# Empty projects that test all the known ep_add argument key words: # Empty projects that test all the known ExternalProject_Add argument key words:
# #
set(proj MinimalNoOpProject) set(proj MinimalNoOpProject)
ep_add(${proj} ExternalProject_Add(${proj}
BUILD_COMMAND "" BUILD_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
@ -40,7 +40,7 @@ ep_add(${proj}
) )
set(proj EmptyNoOpProject) set(proj EmptyNoOpProject)
ep_add(${proj} ExternalProject_Add(${proj}
BUILD_COMMAND "" BUILD_COMMAND ""
CMAKE_ARGS "" CMAKE_ARGS ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
@ -63,16 +63,16 @@ ep_add(${proj}
# #
if(can_build_tutorial_step5) if(can_build_tutorial_step5)
set(proj TutorialStep5-Local) set(proj TutorialStep5-Local)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
TEST_BEFORE_INSTALL 1 TEST_BEFORE_INSTALL 1
) )
ep_get(${proj} install_dir) ExternalProject_Get_Property(${proj} install_dir)
set(TutorialStep5_install_dir ${install_dir}) set(TutorialStep5_install_dir ${install_dir})
set(proj TutorialStep5-Local-TestAfterInstall) set(proj TutorialStep5-Local-TestAfterInstall)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
TEST_AFTER_INSTALL 1 TEST_AFTER_INSTALL 1
@ -83,7 +83,7 @@ endif()
# Local TAR: # Local TAR:
# #
set(proj TutorialStep1-LocalTAR) set(proj TutorialStep1-LocalTAR)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar" URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
LIST_SEPARATOR :: LIST_SEPARATOR ::
PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
@ -94,14 +94,14 @@ ep_add(${proj}
) )
set(proj TutorialStep1-LocalNoDirTAR) set(proj TutorialStep1-LocalNoDirTAR)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar" URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
LIST_SEPARATOR @@ LIST_SEPARATOR @@
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
-DTEST_LIST:STRING=1@@2@@3 -DTEST_LIST:STRING=1@@2@@3
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
ep_add_step(${proj} mypatch ExternalProject_Add_Step(${proj} mypatch
COMMAND ${CMAKE_COMMAND} -E echo "This is a custom external project step." COMMAND ${CMAKE_COMMAND} -E echo "This is a custom external project step."
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/Step1Patch.cmake
WORKING_DIRECTORY <SOURCE_DIR> WORKING_DIRECTORY <SOURCE_DIR>
@ -113,14 +113,14 @@ ep_add_step(${proj} mypatch
# Local TGZ: # Local TGZ:
# #
set(proj TutorialStep1-LocalTGZ) set(proj TutorialStep1-LocalTGZ)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz" URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
set(proj TutorialStep1-LocalNoDirTGZ) set(proj TutorialStep1-LocalNoDirTGZ)
ep_add(${proj} ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz" URL "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@ -143,11 +143,11 @@ endif()
if(do_cvs_tests) if(do_cvs_tests)
# Unzip/untar the CVS repository in our source folder so that other # Unzip/untar the CVS repository in our source folder so that other
# projects below may use it to test CVS args of ep_add # projects below may use it to test CVS args of ExternalProject_Add
# #
set(proj SetupLocalCVSRepository) set(proj SetupLocalCVSRepository)
set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS") set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS")
ep_add(${proj} ExternalProject_Add(${proj}
SOURCE_DIR ${local_cvs_repo} SOURCE_DIR ${local_cvs_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
BUILD_COMMAND "" BUILD_COMMAND ""
@ -158,7 +158,7 @@ if(do_cvs_tests)
# CVS by date stamp: # CVS by date stamp:
# #
set(proj TutorialStep1-CVS-20090626) set(proj TutorialStep1-CVS-20090626)
ep_add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CVS_TAG "-D2009-06-26 16:50:00 UTC" CVS_TAG "-D2009-06-26 16:50:00 UTC"
@ -172,7 +172,7 @@ if(do_cvs_tests)
# CVS by tag: # CVS by tag:
# #
set(proj TutorialStep1-CVS-testtag1) set(proj TutorialStep1-CVS-testtag1)
ep_add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CVS_TAG -rtesttag1 CVS_TAG -rtesttag1
@ -186,7 +186,7 @@ if(do_cvs_tests)
# Live CVS / HEAD (no CVS_TAG): # Live CVS / HEAD (no CVS_TAG):
# #
set(proj TutorialStep1-CVS-HEAD) set(proj TutorialStep1-CVS-HEAD)
ep_add(${proj} ExternalProject_Add(${proj}
CVS_REPOSITORY "${local_cvs_repo}" CVS_REPOSITORY "${local_cvs_repo}"
CVS_MODULE "TutorialStep1" CVS_MODULE "TutorialStep1"
CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_GENERATOR "${CMAKE_GENERATOR}"
@ -238,12 +238,12 @@ endif()
if(do_svn_tests) if(do_svn_tests)
# Unzip/untar the SVN repository in our source folder so that other # Unzip/untar the SVN repository in our source folder so that other
# projects below may use it to test SVN args of ep_add # projects below may use it to test SVN args of ExternalProject_Add
# #
set(proj SetupLocalSVNRepository) set(proj SetupLocalSVNRepository)
set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN") set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN")
set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1") set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1")
ep_add(${proj} ExternalProject_Add(${proj}
SOURCE_DIR ${local_svn_repo} SOURCE_DIR ${local_svn_repo}
URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
BUILD_COMMAND "" BUILD_COMMAND ""
@ -254,7 +254,7 @@ if(do_svn_tests)
# SVN by date stamp: # SVN by date stamp:
# #
set(proj TutorialStep1-SVN-20090626) set(proj TutorialStep1-SVN-20090626)
ep_add(${proj} ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}" SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r{2009-06-26 16:50:00 +0000}" SVN_REVISION "-r{2009-06-26 16:50:00 +0000}"
UPDATE_COMMAND "" UPDATE_COMMAND ""
@ -267,7 +267,7 @@ if(do_svn_tests)
# SVN by revision number: # SVN by revision number:
# #
set(proj TutorialStep1-SVN-r2) set(proj TutorialStep1-SVN-r2)
ep_add(${proj} ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}" SVN_REPOSITORY "${local_svn_repo_url}"
SVN_REVISION "-r2" SVN_REVISION "-r2"
UPDATE_COMMAND "" UPDATE_COMMAND ""
@ -280,7 +280,7 @@ if(do_svn_tests)
# Live SVN / trunk (no SVN_REVISION): # Live SVN / trunk (no SVN_REVISION):
# #
set(proj TutorialStep1-SVN-trunk) set(proj TutorialStep1-SVN-trunk)
ep_add(${proj} ExternalProject_Add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}" SVN_REPOSITORY "${local_svn_repo_url}"
CMAKE_GENERATOR "${CMAKE_GENERATOR}" CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@ -303,16 +303,22 @@ enable_testing()
if(can_build_tutorial_step5) if(can_build_tutorial_step5)
add_test(TutorialStep5-Local-BuildTreeTest add_test(TutorialStep5-Local-BuildTreeTest
"${binary_base}/TutorialStep5-Local/Tutorial" 42) "${binary_base}/TutorialStep5-Local/Tutorial" 42)
set_property(TEST TutorialStep5-Local-BuildTreeTest
APPEND PROPERTY LABELS Step5 BuildTree)
endif() endif()
add_test(TutorialStep1-LocalTAR-BuildTreeTest add_test(TutorialStep1-LocalTAR-BuildTreeTest
"${binary_base}/TutorialStep1-LocalTAR/EP-Tutorial" 36) "${binary_base}/TutorialStep1-LocalTAR/EP-Tutorial" 36)
set_property(TEST TutorialStep1-LocalTAR-BuildTreeTest
APPEND PROPERTY LABELS TAR)
add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest add_test(TutorialStep1-LocalNoDirTAR-BuildTreeTest
"${binary_base}/TutorialStep1-LocalNoDirTAR/EP-Tutorial" 25) "${binary_base}/TutorialStep1-LocalNoDirTAR/EP-Tutorial" 25)
add_test(TutorialStep1-LocalTGZ-BuildTreeTest add_test(TutorialStep1-LocalTGZ-BuildTreeTest
"${binary_base}/TutorialStep1-LocalTGZ/Tutorial" 16) "${binary_base}/TutorialStep1-LocalTGZ/Tutorial" 16)
set_property(TEST TutorialStep1-LocalTGZ-BuildTreeTest
APPEND PROPERTY LABELS TGZ)
add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest add_test(TutorialStep1-LocalNoDirTGZ-BuildTreeTest
"${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9) "${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
@ -345,4 +351,6 @@ endif()
if(can_build_tutorial_step5) if(can_build_tutorial_step5)
add_test(TutorialStep5-InstallTreeTest add_test(TutorialStep5-InstallTreeTest
"${TutorialStep5_install_dir}/bin/Tutorial" 49) "${TutorialStep5_install_dir}/bin/Tutorial" 49)
set_property(TEST TutorialStep5-InstallTreeTest
APPEND PROPERTY LABELS Step5 InstallTree)
endif() endif()