diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-03 13:25:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-03 13:25:10 (GMT) |
| commit | 7ac2b1256b09044b86c6bd926cc239133beab088 (patch) | |
| tree | b45456f41ea1885955795ce3c65c6b29ce502884 /Modules | |
| parent | 94d53d1664b1e792e8088880cfd206e8e81ff625 (diff) | |
| parent | 14e49ed15615e7f2bcb58aa4540683250006f5c7 (diff) | |
| download | CMake-7ac2b1256b09044b86c6bd926cc239133beab088.zip CMake-7ac2b1256b09044b86c6bd926cc239133beab088.tar.gz CMake-7ac2b1256b09044b86c6bd926cc239133beab088.tar.bz2 | |
Merge topic 'if-test'
14e49ed1 if: Add "TEST <test>" condition
623dcc85 ExternalProject: Avoid if() auto-dereference of a "TEST" variable
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index f6844be..fdb146a 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1211,7 +1211,7 @@ function(_ep_get_build_command name step cmd_var) if(step STREQUAL "INSTALL") set(args install) endif() - if(step STREQUAL "TEST") + if("x${step}x" STREQUAL "xTESTx") set(args test) endif() else() @@ -1230,7 +1230,7 @@ function(_ep_get_build_command name step cmd_var) list(APPEND args --target install) endif() # But for "TEST" drive the project with corresponding "ctest". - if(step STREQUAL "TEST") + if("x${step}x" STREQUAL "xTESTx") string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}") set(args "") endif() @@ -1246,7 +1246,7 @@ function(_ep_get_build_command name step cmd_var) if(step STREQUAL "INSTALL") set(args install) endif() - if(step STREQUAL "TEST") + if("x${step}x" STREQUAL "xTESTx") set(args test) endif() endif() |