diff options
author | Brad King <brad.king@kitware.com> | 2019-01-17 16:43:02 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-17 16:43:09 (GMT) |
commit | 68e20f674a48be38d60e129f600faf7c483f2b97 (patch) | |
tree | 12eace6e569c0aa97f86f4405fdcbcdb75068adc /Source/CTest/cmCTestLaunch.cxx | |
parent | bd3685b6cfac90bb553df0330e1732c066fe7dca (diff) | |
parent | 4568d046c46a7357ab48ddfb1117bad39e65572c (diff) | |
download | CMake-68e20f674a48be38d60e129f600faf7c483f2b97.zip CMake-68e20f674a48be38d60e129f600faf7c483f2b97.tar.gz CMake-68e20f674a48be38d60e129f600faf7c483f2b97.tar.bz2 |
Merge topic 'cmake_role-global-property'
4568d046c4 Properties: Add CMAKE_ROLE global property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2805
Diffstat (limited to 'Source/CTest/cmCTestLaunch.cxx')
-rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 6cd1c09..4facea2 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -15,6 +15,7 @@ #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmProcessOutput.h" +#include "cmState.h" #include "cmStateSnapshot.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" @@ -610,7 +611,7 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) void cmCTestLaunch::LoadConfig() { - cmake cm(cmake::RoleScript); + cmake cm(cmake::RoleScript, cmState::CTest); cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); cm.GetCurrentSnapshot().SetDefaultDefinitions(); |