CMakeLists.txt demo

cmake/CMakeLists.txt

Index: cmake/CMakeLists.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 58c04db8d935b3d336ab76065829b970bfa0563d..6a2da9b5884b482e831318606ad81e2b959f6e7b 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -113,7 +113,9 @@ if (WIN32)
 endif()
 
 remove_srcs(../src/gpu/gl/angle/*)  # TODO
-remove_srcs(../src/codec/* ../src/android/*)  # TODO: Requires Chromium's libjpeg-turbo, and incompatible giflib.
+remove_srcs(../src/android/*)
+
+remove_srcs(../src/codec/*Raw*.cpp)
 
 # Certain files must be compiled with support for SSSE3, SSE4.1, AVX, or AVX2 intrinsics.
 file (GLOB_RECURSE ssse3_srcs ../src/*ssse3*.cpp ../src/*SSSE3*.cpp)
@@ -128,7 +130,10 @@ 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.
 find_package (EXPAT)
+find_package (GIF)
+find_package (JPEG)
 find_package (Lua)
+find_package (PNG)
 find_package (ZLIB)
 # No find_package for libwebp as far as I can tell, so simulate it here.
 find_path (WEBP_INCLUDE_DIRS "webp/decode.h")
@@ -141,9 +146,6 @@ if (UNIX AND NOT APPLE)
     # Same deal for fontconfig.
     find_path (FONTCONFIG_INCLUDE_DIRS "fontconfig/fontconfig.h")
     find_library (FONTCONFIG_LIBRARIES fontconfig)
-    find_package (GIF)
-    find_package (JPEG)
-    find_package (PNG)
 endif()
 
 # TODO: macro away this if (found) ... else() ... endif() stuff.
@@ -159,6 +161,7 @@ if (GIF_FOUND)
     list (APPEND private_includes ${GIF_INCLUDE_DIRS})
     list (APPEND libs             ${GIF_LIBRARIES})
 else()
+    remove_srcs(../src/codec/*Gif*.cpp)
     remove_srcs(../src/images/*gif*)
 endif()
 
@@ -166,6 +169,8 @@ if (JPEG_FOUND)
     list (APPEND private_includes ${JPEG_INCLUDE_DIRS})
     list (APPEND libs             ${JPEG_LIBRARIES})
 else()
+    remove_srcs(../src/codec/*Jpeg*.cpp)
+    remove_srcs(../src/codec/*Raw*.cpp)
     remove_srcs(../src/images/*jpeg*)
 endif()
 
@@ -180,6 +185,8 @@ if (PNG_FOUND)
     list (APPEND private_includes ${PNG_INCLUDE_DIRS})
     list (APPEND libs             ${PNG_LIBRARIES})
 else()
+    remove_srcs(../src/codec/*Png*.cpp)
+    remove_srcs(../src/codec/*Ico*.cpp)
     remove_srcs(../src/images/*png*)
 endif()
 
@@ -195,6 +202,7 @@ if (WEBP_INCLUDE_DIRS AND WEBP_LIBRARIES)
     list (APPEND private_includes ${WEBP_INCLUDE_DIRS})
     list (APPEND libs             ${WEBP_LIBRARIES})
 else()
+    remove_srcs(../src/codec/*Webp*.cpp)
     remove_srcs(../src/images/*webp*)
 endif()