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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 274c631..3ff576e 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3374,7 +3374,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, // make sure the same generator is used // use this program as the cmake to be run, it should not // be run that way but the cmake object requires a vailid path - cmake cm(cmake::RoleProject); + cmake cm(cmake::RoleProject, cmState::Project); cm.SetIsInTryCompile(true); cmGlobalGenerator* gg = cm.CreateGlobalGenerator(this->GetGlobalGenerator()->GetName()); |