summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-12-12 19:21:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-12-12 19:21:23 (GMT)
commit55ff3c78b3d0d08cdbc6dea700e2add6a64c988b (patch)
tree154ec774589266369547c83ade1fc0caf97d25c2 /Source
parentce71bd9505a46d7350c0e256f2d8f4f183d1c9fa (diff)
parent9ac0c3936e612ec4780ea96d298095e2ad907fef (diff)
downloadCMake-55ff3c78b3d0d08cdbc6dea700e2add6a64c988b.zip
CMake-55ff3c78b3d0d08cdbc6dea700e2add6a64c988b.tar.gz
CMake-55ff3c78b3d0d08cdbc6dea700e2add6a64c988b.tar.bz2
Merge topic 'xcode-message-extension'
9ac0c393 Help: Add notes for topic 'xcode-message-extension' 0ae46321 Xcode: Add target property to override explicitFileType 7ecac703 Xcode: Add target property to override productType
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 50197c9..736aa91 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2313,6 +2313,10 @@ const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
const char* cmGlobalXCodeGenerator::GetTargetFileType(
cmGeneratorTarget* target)
{
+ if (const char* e = target->GetProperty("XCODE_EXPLICIT_FILE_TYPE")) {
+ return e;
+ }
+
switch (target->GetType()) {
case cmStateEnums::OBJECT_LIBRARY:
case cmStateEnums::STATIC_LIBRARY:
@@ -2340,6 +2344,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
const char* cmGlobalXCodeGenerator::GetTargetProductType(
cmGeneratorTarget* target)
{
+ if (const char* e = target->GetProperty("XCODE_PRODUCT_TYPE")) {
+ return e;
+ }
+
switch (target->GetType()) {
case cmStateEnums::OBJECT_LIBRARY:
case cmStateEnums::STATIC_LIBRARY: