| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 64 | 64 | 
| 65 # Remove OS-specific source files. | 65 # Remove OS-specific source files. | 
| 66 if (NOT UNIX) | 66 if (NOT UNIX) | 
| 67     remove_srcs(../src/ports/*_posix.cpp | 67     remove_srcs(../src/ports/*_posix.cpp | 
| 68                 ../src/ports/SkTLS_pthread.cpp | 68                 ../src/ports/SkTLS_pthread.cpp | 
| 69                 ../src/ports/SkTime_Unix.cpp | 69                 ../src/ports/SkTime_Unix.cpp | 
| 70                 ../src/utils/SkThreadUtils_pthread.cpp) | 70                 ../src/utils/SkThreadUtils_pthread.cpp) | 
| 71 endif() | 71 endif() | 
| 72 if (APPLE OR NOT UNIX) | 72 if (APPLE OR NOT UNIX) | 
| 73     remove_srcs(../src/gpu/gl/glx/* | 73     remove_srcs(../src/gpu/gl/glx/* | 
| 74                 ../src/images/SkImageDecoder_FactoryDefault.cpp |  | 
| 75                 ../src/ports/SkFontMgr_fontconfig*.cpp | 74                 ../src/ports/SkFontMgr_fontconfig*.cpp | 
| 76                 ../src/ports/SkFontMgr_android*.cpp | 75                 ../src/ports/SkFontMgr_android*.cpp | 
| 77                 ../src/*FreeType*) | 76                 ../src/*FreeType*) | 
| 78 endif() | 77 endif() | 
| 79 | 78 | 
| 80 # Remove processor-specific source files. | 79 # Remove processor-specific source files. | 
| 81 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ARM) | 80 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ARM) | 
| 82     remove_srcs(../src/*arm* ../src/*ARM* ../src/*neon* ../src/*NEON*) | 81     remove_srcs(../src/*arm* ../src/*ARM* ../src/*neon* ../src/*NEON*) | 
| 83 endif() | 82 endif() | 
| 84 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL MIPS) | 83 if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL MIPS) | 
| (...skipping 246 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 | 
|---|