diff options
| author |  msarett <msarett@google.com> | 2016-03-25 08:58:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 08:58:55 -0700 |
| commit | c1d0312b227328bee7240d1df4ceee55cf6e1858 (patch) | |
| tree | 97e1e19854530f9481bbac3fb59e54075083d779 /cmake | |
| parent | 587ea71a522cd05601b401d17ad207c01f0ee0d6 (diff) | |
Rename encoders to Sk*ImageEncoder
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1836493002
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/1836493002
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b375e59f45..faeb2f8a75 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -71,7 +71,7 @@ if (NOT UNIX) endif() if (APPLE OR NOT UNIX) remove_srcs(../src/gpu/gl/glx/* - ../src/images/SkImageDecoder_FactoryDefault.cpp + ../src/images/SkMovie_FactoryDefault.cpp ../src/ports/SkFontMgr_fontconfig*.cpp ../src/ports/SkFontMgr_android*.cpp ../src/*FreeType*) @@ -102,6 +102,7 @@ remove_srcs( ../src/ports/SkFontMgr_empty_factory.cpp ../src/ports/SkGlobalInitialization_chromium.cpp ../src/ports/SkImageDecoder_empty.cpp + ../src/ports/SkImageEncoder_none.cpp ../src/ports/SkImageGenerator_none.cpp ../src/ports/SkTLS_none.cpp) @@ -171,7 +172,7 @@ if (GIF_FOUND) list (APPEND libs ${GIF_LIBRARIES}) add_definitions(-DSK_CODEC_DECODES_GIF) else() - remove_srcs(../src/images/*gif*) + remove_srcs(../src/images/*GIF*) remove_srcs(../src/codec/*Gif*) endif() @@ -180,8 +181,7 @@ if (JPEG_FOUND) list (APPEND libs ${JPEG_LIBRARIES}) add_definitions(-DSK_CODEC_DECODES_JPEG) else() - remove_srcs(../src/images/*jpeg*) - remove_srcs(../src/images/*Jpeg*) + remove_srcs(../src/images/*JPEG*) remove_srcs(../src/codec/*Jpeg*) endif() @@ -199,7 +199,7 @@ if (PNG_FOUND) add_definitions(-DPNG_SKIP_SKIA_OPTS) add_definitions(-DSK_CODEC_DECODES_PNG) else() - remove_srcs(../src/images/*png*) + remove_srcs(../src/images/*PNG*) remove_srcs(../src/codec/*Png*) remove_srcs(../src/codec/*Ico*) endif() @@ -218,7 +218,7 @@ if (WEBP_INCLUDE_DIRS AND WEBP_LIBRARIES) list (APPEND libs ${WEBP_LIBRARIES}) add_definitions(-DSK_CODEC_DECODES_WEBP) else() - remove_srcs(../src/images/*webp*) + remove_srcs(../src/images/*WEBP*) remove_srcs(../src/codec/*Webp*) endif() |