CMake, include/: changes to make fiddle 2.0 better

cmake/CMakeLists.txt

 # Boilerplate.
 cmake_minimum_required (VERSION 3.1)   # First version with CMAKE_CXX_STANDARD.
 project (skimake)
 set (CMAKE_CXX_STANDARD 11)
 
 # Default to Release mode.  We're mainly targeting Skia users, not Skia developers.
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Release)
 endif ()
 
@@ skipping 36 matching lines @@
 remove_srcs (../src/images/SkForceLinking.cpp)
 # Chrome only?
 remove_srcs (../src/ports/SkFontHost_fontconfig.cpp
              ../src/fonts/SkFontMgr_fontconfig.cpp
              ../src/ports/SkFontConfigInterface_direct.cpp)
 # Alternative font managers.
 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)
     remove_srcs(../src/ports/*_posix.cpp
                 ../src/ports/SkTLS_pthread.cpp
                 ../src/ports/SkTime_Unix.cpp
                 ../src/utils/SkThreadUtils_pthread.cpp)
 endif()
 if (APPLE OR NOT UNIX)
     remove_srcs(../src/gpu/gl/glx/*
@@ skipping 212 matching lines @@
   get_filename_component (abs_include ${include} ABSOLUTE)
   file (APPEND ${compile_arguments} "-I${abs_include}\n")
 endforeach()
 
 # cmake .
 # cmake --build . --target skia
 # c++ -c @skia_compile_arguments.txt example.cpp
 # 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")
 file(APPEND ${skia_h_path} "#define skia_DEFINED\n")
 foreach (include ${public_includes})
   if (NOT include STREQUAL userconfig_directory)
     file (APPEND ${skia_h_path} "\n")
     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()
 file(APPEND ${skia_h_path} "\n#endif  // skia_DEFINED\n")
 
 # Now build a simple example app that uses Skia via libskia.so.
 add_executable(example example.cpp)
 target_link_libraries(example skia ${OPENGL_LIBRARIES})