summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-10 13:12:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-10 13:12:32 (GMT)
commitcce9671b4fea099c5109569108bca2dafe92a97e (patch)
tree23ba104b142dcdb9e42cfc8988deeec8cbd5d242 /Modules
parent976c3ccc6aa62d58a613fe3106c73fce134123e2 (diff)
parent86032ae0ebb7e86f3ff5617e080dd827dbbe98b0 (diff)
downloadCMake-cce9671b4fea099c5109569108bca2dafe92a97e.zip
CMake-cce9671b4fea099c5109569108bca2dafe92a97e.tar.gz
CMake-cce9671b4fea099c5109569108bca2dafe92a97e.tar.bz2
Merge topic 'ExternalProject-byproducts-tokens'
86032ae0 ExternalProject: Replace placeholder tokens in BYPRODUCTS
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 1f9f4d3..d7b985d 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -251,8 +251,8 @@ Create custom targets to build projects in external trees
``LOG 1``
Wrap step in script to log output
- The command line, comment, and working directory of every standard and
- custom step is processed to replace tokens ``<SOURCE_DIR>``,
+ The command line, comment, working directory, and byproducts of every
+ standard and custom step are processed to replace tokens ``<SOURCE_DIR>``,
``<BINARY_DIR>``, ``<INSTALL_DIR>``, and ``<TMP_DIR>`` with
corresponding property values.
@@ -1443,7 +1443,7 @@ function(ExternalProject_Add_Step name step)
endif()
# Replace location tags.
- _ep_replace_location_tags(${name} comment command work_dir)
+ _ep_replace_location_tags(${name} comment command work_dir byproducts)
# Custom comment?
get_property(comment_set TARGET ${name} PROPERTY _EP_${step}_COMMENT SET)