diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-13 12:58:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-13 12:58:50 (GMT) |
| commit | 22908e4be83679deb32cf771df9d7793681814fd (patch) | |
| tree | f2a8eee9d2122968ba6d121087fe29339a75dba4 /Source | |
| parent | b46fa35824f2e8716032b3ec3201d0a0ee445f86 (diff) | |
| parent | 3fd9f4ab0595f15588055fef1ad8dd8612945e22 (diff) | |
| download | CMake-22908e4be83679deb32cf771df9d7793681814fd.zip CMake-22908e4be83679deb32cf771df9d7793681814fd.tar.gz CMake-22908e4be83679deb32cf771df9d7793681814fd.tar.bz2 | |
Merge topic 'xcode-test-schema-generation'
3fd9f4ab Xcode: Add test for schema generation
cf13e495 Xcode: Control schema generation via variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !577
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index b023d5c..77f3408 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3341,8 +3341,7 @@ void cmGlobalXCodeGenerator::OutputXCodeProject( // Since the lowest available Xcode version for testing was 7.0, // I'm setting this as a limit then - if (this->GetCMakeInstance()->GetState()->GetGlobalPropertyAsBool( - "XCODE_GENERATE_SCHEME") && + if (root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_SCHEME") && this->XcodeVersion >= 70) { this->OutputXCodeSharedSchemes(xcodeDir); this->OutputXCodeWorkspaceSettings(xcodeDir); |