cmake tweaks

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 35 matching lines @@
              ../src/fonts/SkFontMgr_fontconfig.cpp
              ../src/ports/SkFontConfigInterface_direct.cpp)
 # Alternative font managers.
 remove_srcs (../src/ports/SkFontMgr_custom*.cpp)
 # Not actually used by Skia.
 remove_srcs (../src/utils/SkThreadUtils_pthread_*.cpp)
 
 # Skia sure ships a lot of code no one uses.
 remove_srcs (../src/animator/* ../src/*nacl* ../src/svg/* ../src/views/* ../src/xml/*)
 
-# Some files only contain code in Debug mode.  This quiets down some linker warnings.
-if (NOT CMAKE_BUILD_TYPE STREQUAL Debug)
-    remove_srcs (../src/core/SkDebug.cpp ../src/utils/SkDumpCanvas.cpp)
-endif()
-
 # Remove OS-specific source files.
 if (NOT WIN32)
     remove_srcs(../src/*XPS*
                 ../src/*_win*.cpp
                 ../src/gpu/gl/angle/*
                 ../src/ports/SkImageDecoder_WIC.cpp
                 ../src/utils/win/*)
 endif()
 if (APPLE OR NOT UNIX)
     remove_srcs(../src/gpu/gl/glx/*
                 ../src/images/SkImageDecoder_FactoryDefault.cpp
                 ../src/ports/SkFontMgr_fontconfig*.cpp
                 ../src/*FreeType*)
 endif()
 if (NOT ANDROID)
     remove_srcs(../src/*Hwui* ../src/*android*)
 endif()
 if (NOT APPLE)
     remove_srcs(../src/*darwin*
                 ../src/ports/SkImageDecoder_CG.cpp
                 ../src/utils/mac/*
-                ../src/*mac*)
+                ../src/*_mac*)
 endif()
 
 # Remove processor-specific source files.
 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ARM)
     remove_srcs(../src/*arm* ../src/*ARM* ../src/*neon* ../src/*NEON*)
 endif()
 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL MIPS)
     remove_srcs(../src/*mips* ../src/*MIPS*)
 endif()
 
@@ skipping 101 matching lines @@
 
 if (APPLE)
     find_library(APPLICATION_SERVICES_FRAMEWORK ApplicationServices REQUIRED)
     list (APPEND libs ${APPLICATION_SERVICES_FRAMEWORK})
 endif()
 
 if (OSMESA_LIBRARIES AND OSMESA_INCLUDE_DIRS)
     list (APPEND libs             ${OSMESA_LIBRARIES})
     list (APPEND private_includes ${OSMESA_INCLUDE_DIRS})
     list (APPEND public_defines   "-DSK_MESA=1")
-    message("-- Found OSMesa: " ${OSMESA_LIBRARIES})
 else()
     remove_srcs(../src/gpu/gl/mesa/*)
-    message("-- Could NOT find OSMesa")
 endif()
 
 find_package(OpenGL REQUIRED)
 list (APPEND libs  ${OPENGL_LIBRARIES})
 
 # This is our main output, libskia.so.
 # We mostly build an .so here because it helps test we've linked everything,
 # not so much that we think Skia is a good candidate to ship as a shared library.
 add_library (skia SHARED ${srcs})
 
 list (APPEND private_defines "-DSKIA_DLL")
 
 target_compile_definitions(skia
     PUBLIC  ${public_defines}
     PRIVATE ${private_defines})
 
 target_include_directories(skia
     PUBLIC  ${public_includes}
     PRIVATE ${private_includes})
 
 target_link_libraries(skia
     PUBLIC
     PRIVATE ${libs})
 
 
 set_target_properties(skia PROPERTIES
-    COMPILE_FLAGS "-fno-exceptions -fno-rtti -Wno-deprecated-declarations"
+    COMPILE_FLAGS "-w -fno-exceptions -fno-rtti"
     CXX_VISIBILITY_PRESET hidden
     VISIBILITY_INLINES_HIDDEN true)
 
 # Experimental C API install:
-file(GLOB cheaders "../include/c/*.h")
-install(FILES ${cheaders} DESTINATION include)
+file(GLOB c_headers "../include/c/*.h")
+install(FILES ${c_headers} DESTINATION include)
 install(TARGETS skia DESTINATION lib)
 
 # Now build a simple example app that uses Skia via libskia.so.
 add_executable(example example.cpp)
 target_link_libraries(example skia ${OPENGL_LIBRARIES})