| OLD | NEW | 
|    1 # Boilerplate. |    1 # Boilerplate. | 
|    2 cmake_minimum_required (VERSION 3.1)   # First version with CMAKE_CXX_STANDARD. |    2 cmake_minimum_required (VERSION 3.1)   # First version with CMAKE_CXX_STANDARD. | 
|    3 project (skimake) |    3 project (skimake) | 
|    4 set (CMAKE_CXX_STANDARD 11) |    4 set (CMAKE_CXX_STANDARD 11) | 
|    5  |    5  | 
|    6 # Default to Release mode.  We're mainly targeting Skia users, not Skia develope
     rs. |    6 # Default to Release mode.  We're mainly targeting Skia users, not Skia develope
     rs. | 
|    7 if (NOT CMAKE_BUILD_TYPE) |    7 if (NOT CMAKE_BUILD_TYPE) | 
|    8     set (CMAKE_BUILD_TYPE Release) |    8     set (CMAKE_BUILD_TYPE Release) | 
|    9 endif () |    9 endif () | 
|   10  |   10  | 
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  193 endif() |  193 endif() | 
|  194  |  194  | 
|  195 if (PNG_FOUND) |  195 if (PNG_FOUND) | 
|  196     list (APPEND private_includes ${PNG_INCLUDE_DIRS}) |  196     list (APPEND private_includes ${PNG_INCLUDE_DIRS}) | 
|  197     list (APPEND libs             ${PNG_LIBRARIES}) |  197     list (APPEND libs             ${PNG_LIBRARIES}) | 
|  198     add_definitions(-DPNG_SKIP_SETJMP_CHECK) |  198     add_definitions(-DPNG_SKIP_SETJMP_CHECK) | 
|  199     add_definitions(-DPNG_SKIP_SKIA_OPTS) |  199     add_definitions(-DPNG_SKIP_SKIA_OPTS) | 
|  200     add_definitions(-DSK_CODEC_DECODES_PNG) |  200     add_definitions(-DSK_CODEC_DECODES_PNG) | 
|  201 else() |  201 else() | 
|  202     remove_srcs(../src/images/*png*) |  202     remove_srcs(../src/images/*png*) | 
|  203     remove_srcs(../src/images/*ico*) |  | 
|  204     remove_srcs(../src/codec/*Png*) |  203     remove_srcs(../src/codec/*Png*) | 
|  205     remove_srcs(../src/codec/*Ico*) |  204     remove_srcs(../src/codec/*Ico*) | 
|  206 endif() |  205 endif() | 
|  207  |  206  | 
|  208 if (ZLIB_FOUND) |  207 if (ZLIB_FOUND) | 
|  209     list (APPEND private_includes ${ZLIB_INCLUDE_DIRS}) |  208     list (APPEND private_includes ${ZLIB_INCLUDE_DIRS}) | 
|  210     list (APPEND libs             ${ZLIB_LIBRARIES}) |  209     list (APPEND libs             ${ZLIB_LIBRARIES}) | 
|  211     remove_srcs(../src/pdf/SkDocument_PDF_None.cpp) |  210     remove_srcs(../src/pdf/SkDocument_PDF_None.cpp) | 
|  212 else() |  211 else() | 
|  213     remove_srcs(../src/pdf/*.cpp) |  212     remove_srcs(../src/pdf/*.cpp) | 
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  331         file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n") |  330         file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n") | 
|  332       endif () |  331       endif () | 
|  333     endforeach() |  332     endforeach() | 
|  334   endif() |  333   endif() | 
|  335 endforeach() |  334 endforeach() | 
|  336 file(APPEND ${skia_h_path} "\n#endif  // skia_DEFINED\n") |  335 file(APPEND ${skia_h_path} "\n#endif  // skia_DEFINED\n") | 
|  337  |  336  | 
|  338 # Now build a simple example app that uses Skia via libskia.so. |  337 # Now build a simple example app that uses Skia via libskia.so. | 
|  339 add_executable(example example.cpp) |  338 add_executable(example example.cpp) | 
|  340 target_link_libraries(example skia ${OPENGL_LIBRARIES}) |  339 target_link_libraries(example skia ${OPENGL_LIBRARIES}) | 
| OLD | NEW |