update CMake and Google3 builds for AVX/AVX2

cmake/CMakeLists.txt

Index: cmake/CMakeLists.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2de051b3fc5aa84eb5131cdab286812bc02580d2..308f6242f6f752c61f9eed4f10c0cb34e023bb63 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -117,8 +117,12 @@ remove_srcs(../src/codec/* ../src/android/*)  # TODO: Requires Chromium's libjpe
 # Certain files must be compiled with support for SSSE3 or SSE4.1 intrinsics.

[dogben, 2015/12/17 17:27:10]

nit: update the comment

[mtklein, 2015/12/17 18:02:23]

done

 file (GLOB_RECURSE ssse3_srcs ../src/*ssse3*.cpp ../src/*SSSE3*.cpp)
 file (GLOB_RECURSE sse41_srcs ../src/*sse4*.cpp ../src/*SSE4*.cpp)
+file (GLOB_RECURSE avx_srcs   ../src/*_avx.cpp)
+file (GLOB_RECURSE avx2_srcs  ../src/*_avx2.cpp)
 set_source_files_properties(${ssse3_srcs} PROPERTIES COMPILE_FLAGS -mssse3)
 set_source_files_properties(${sse41_srcs} PROPERTIES COMPILE_FLAGS -msse4.1)
+set_source_files_properties(${avx_srcs}   PROPERTIES COMPILE_FLAGS -mavx)
+set_source_files_properties(${avx2_srcs}  PROPERTIES COMPILE_FLAGS -mavx2)
 
 # Detect our optional dependencies.
 # If we can't find them, don't build the parts of Skia that use them.