Don't build CG on Linux CMake
authormsarett <msarett@google.com>
Wed, 9 Mar 2016 23:12:31 +0000 (15:12 -0800)
committerCommit bot <commit-bot@chromium.org>
Wed, 9 Mar 2016 23:12:31 +0000 (15:12 -0800)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1784663002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot

Review URL: https://codereview.chromium.org/1784663002

cmake/CMakeLists.txt
src/ports/SkImageGeneratorCG.cpp

index e5c8a35..f0b0e31 100644 (file)
@@ -105,6 +105,10 @@ remove_srcs(
     ../src/ports/SkImageGenerator_none.cpp
     ../src/ports/SkTLS_none.cpp)
 
+if (NOT APPLE)
+    remove_srcs(../src/ports/SkImageGeneratorCG.cpp)
+endif()
+
 if (WIN32)
     if(SKIA_GDI)
         remove_srcs(../src/ports/SkFontMgr_win_dw_factory.cpp)
index cf00ea7..a3474a1 100644 (file)
@@ -6,7 +6,6 @@
  */
 
 #include "SkImageGeneratorCG.h"
-#include "SkUnpremultiply.h"
 
 #ifdef SK_BUILD_FOR_MAC
 #include <ApplicationServices/ApplicationServices.h>