commit 4ce6989332b7e44b95267840409b118523e93e89
author Brian Salomon <bsalomon@google.com> Fri Jul 12 14:36:03 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Jul 13 03:05:11 2019 +0000
tree 6192a15822473c783d1fba47ded5e924bd1b8ae8
parent 2db58c47f3285f9337c06ba46c348132bda40851

Fix building Metal backend with CMake

Change-Id: Ica940030367327cb2e35f90b1cc6b4202d4f3422
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227062
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

gn/gn_to_cmake.py

diff --git a/gn/gn_to_cmake.py b/gn/gn_to_cmake.py
index 7d26a2f..5deaaa8 100644
--- a/gn/gn_to_cmake.py
+++ b/gn/gn_to_cmake.py
@@ -116,7 +116,8 @@
   '.cc': 'cxx',
   '.cpp': 'cxx',
   '.cxx': 'cxx',
-  '.mm': 'cxx',
+  '.m': 'objc',
+  '.mm': 'objcc',
   '.c': 'c',
   '.s': 'asm',
   '.S': 'asm',
@@ -447,10 +448,19 @@
   cflags_asm = target.properties.get('asmflags', [])
   cflags_c = target.properties.get('cflags_c', [])
   cflags_cxx = target.properties.get('cflags_cc', [])
-  if 'c' in sources and not any(k in sources for k in ('asm', 'cxx')):
+  cflags_objc = cflags_c[:]
+  cflags_objc.extend(target.properties.get('cflags_objc', []))
+  cflags_objcc = cflags_cxx[:]
+  cflags_objcc.extend(target.properties.get('cflags_objcc', []))
+
+  if 'c' in sources and not any(k in sources for k in ('asm', 'cxx', 'objc', 'objcc')):
     flags.extend(cflags_c)
-  elif 'cxx' in sources and not any(k in sources for k in ('asm', 'c')):
+  elif 'cxx' in sources and not any(k in sources for k in ('asm', 'c', 'objc', 'objcc')):
     flags.extend(cflags_cxx)
+  elif 'objc' in sources and not any(k in sources for k in ('asm', 'c', 'cxx', 'objcc')):
+    flags.extend(cflags_objc)
+  elif 'objcc' in sources and not any(k in sources for k in ('asm', 'c', 'cxx', 'objc')):
+    flags.extend(cflags_objcc)
   else:
     # TODO: This is broken, one cannot generally set properties on files,
     # as other targets may require different properties on the same files.
@@ -460,6 +470,10 @@
       SetFilesProperty(out, sources['c'], 'COMPILE_FLAGS', cflags_c, ' ')
     if 'cxx' in sources and cflags_cxx:
       SetFilesProperty(out, sources['cxx'], 'COMPILE_FLAGS', cflags_cxx, ' ')
+    if 'objc' in sources and cflags_objc:
+      SetFilesProperty(out, sources['objc'], 'COMPILE_FLAGS', cflags_objc, ' ')
+    if 'objcc' in sources and cflags_objcc:
+      SetFilesProperty(out, sources['objcc'], 'COMPILE_FLAGS', cflags_objcc, ' ')
   if flags:
     SetCurrentTargetProperty(out, 'COMPILE_FLAGS', flags, ' ')
 
@@ -480,7 +494,7 @@
 def WriteSourceVariables(out, target, project):
   # gn separates the sheep from the goats based on file extensions.
   # A full separation is done here because of flag handing (see Compile flags).
-  source_types = {'cxx':[], 'c':[], 'asm':[],
+  source_types = {'cxx':[], 'c':[], 'asm':[], 'objc':[], 'objcc':[],
                   'obj':[], 'obj_target':[], 'input':[], 'other':[]}
 
   all_sources = target.properties.get('sources', [])