Xcode: Control schema generation via variable

Issue: #15441
This commit is contained in:
Gregor Jasny
2017-02-24 16:18:35 +01:00
parent ce0704e419
commit cf13e49544
5 changed files with 5 additions and 6 deletions

View File

@@ -46,7 +46,6 @@ Properties of Global Scope
/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS
/prop_gbl/USE_FOLDERS
/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
/prop_gbl/XCODE_GENERATE_SCHEME
.. _`Directory Properties`:

View File

@@ -86,6 +86,7 @@ Variables that Provide Information
/variable/CMAKE_VS_PLATFORM_TOOLSET
/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
/variable/CMAKE_XCODE_GENERATE_SCHEME
/variable/CMAKE_XCODE_PLATFORM_TOOLSET
/variable/PROJECT-NAME_BINARY_DIR
/variable/PROJECT-NAME_SOURCE_DIR

View File

@@ -3,4 +3,4 @@ cmake-xcode-schemes
* The :generator:`Xcode` generator got the ability to create schema files.
This is still an experimental feature and can be activated by setting the
:prop_gbl:`XCODE_GENERATE_SCHEME` global property to a ``TRUE`` value.
:variable:`CMAKE_XCODE_GENERATE_SCHEME` variable to a ``TRUE`` value.

View File

@@ -1,5 +1,5 @@
XCODE_GENERATE_SCHEME
---------------------
CMAKE_XCODE_GENERATE_SCHEME
---------------------------
If enabled, the Xcode generator will generate schema files. Those are
are useful to invoke analyze, archive, build-for-testing and test

View File

@@ -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);