summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-11 12:21:11 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-10-11 12:21:14 (GMT)
commit7237d9489a5ed6224147c91c83fa828af88b1bf2 (patch)
treeb269b5564acec92f7c23d3c957dc1b619d1b430c /Modules
parent027bcee513788b5ab17c3328a14cb8ac8354ba00 (diff)
parent491d2108983990eeda7d91dbc958a7fa9060659f (diff)
downloadCMake-7237d9489a5ed6224147c91c83fa828af88b1bf2.zip
CMake-7237d9489a5ed6224147c91c83fa828af88b1bf2.tar.gz
CMake-7237d9489a5ed6224147c91c83fa828af88b1bf2.tar.bz2
Merge topic 'ExternalProject-CMP0054'
491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1369
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 76f5080..419c9d6 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -854,6 +854,9 @@ The custom step could then be triggered from the main build like so::
#]=======================================================================]
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+
# Pre-compute a regex to match documented keywords for each command.
math(EXPR _ep_documentation_line_count "${CMAKE_CURRENT_LIST_LINE} - 4")
file(STRINGS "${CMAKE_CURRENT_LIST_FILE}" lines
@@ -3035,3 +3038,5 @@ function(ExternalProject_Add name)
#
_ep_add_test_command(${name})
endfunction()
+
+cmake_policy(POP)