CMake, include/: changes to make fiddle 2.0 better

cmake/CMakeLists.txt

Index: cmake/CMakeLists.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 5f0049bdad609443a0267329c49a88c8b6eda028..e77525d688822fbaa15662ff3466b18c63a755d5 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -54,6 +54,10 @@ remove_srcs (../src/ports/SkFontMgr_custom*.cpp)
 
 # Skia sure ships a lot of code no one uses.
 remove_srcs (../src/animator/* ../src/*nacl* ../src/svg/* ../src/views/* ../src/xml/*)
+foreach (include animator svg svg/parser views views/animated xml)
+  file (GLOB globed_include ../include/${include})
+  list (REMOVE_ITEM public_includes ${globed_include})
+endforeach()
 
 # Remove OS-specific source files.
 if (NOT UNIX)
@@ -286,6 +290,8 @@ endforeach()
 # c++ example.o @skia_link_arguments.txt
 
 # skia.h
+set (bad_files GrGLConfig_chrome.h SkJSONCPP.h SkParsePaint.h)
+# make `c++ @skia_compile_arguments.txt include/skia.h` work.
 set (skia_h_path ${userconfig_directory}/skia.h)
 file (WRITE ${skia_h_path} "// skia.h generated by CMake.\n")
 file(APPEND ${skia_h_path} "#ifndef skia_DEFINED\n")
@@ -296,7 +302,9 @@ foreach (include ${public_includes})
     file (GLOB all_public_headers ${include}/*.h)
     foreach (public_header ${all_public_headers})
       get_filename_component (filename_component ${public_header} NAME)
-      file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n")
+      if (NOT ";${bad_files};" MATCHES ";${filename_component};")
+        file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n")
+      endif ()
     endforeach()
   endif()
 endforeach()