Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: cmake/CMakeLists.txt

Issue 1411283005: Start making all .cpp files compile-able on all platforms. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: conditional on expat Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/device/xps/SkXPSDevice.cpp » ('j') | src/ports/SkFontMgr_android_factory.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cmake/CMakeLists.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 348b72475ae071d288937ae3dda77f891a875164..c6614f3feca42e9576a95060834eeeae245acf28 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -52,16 +52,8 @@ remove_srcs (../src/ports/SkFontMgr_custom*.cpp)
remove_srcs (../src/animator/* ../src/*nacl* ../src/svg/* ../src/views/* ../src/xml/*)
# Remove OS-specific source files.
-if (NOT WIN32)
- remove_srcs(../src/*XPS*
- ../src/*_win*.cpp
- ../src/ports/SkImageDecoder_WIC.cpp
- ../src/utils/win/*)
-endif()
if (NOT UNIX)
- remove_srcs(../src/doc/SkDocument_XPS_None.cpp
- ../src/ports/*_posix.cpp
- ../src/ports/SkDebug_stdio.cpp
+ remove_srcs(../src/ports/*_posix.cpp
../src/ports/SkTLS_pthread.cpp
../src/ports/SkTime_Unix.cpp
../src/utils/SkThreadUtils_pthread.cpp)
@@ -72,15 +64,6 @@ if (APPLE OR NOT UNIX)
../src/ports/SkFontMgr_fontconfig*.cpp
../src/*FreeType*)
endif()
-if (NOT ANDROID)
- remove_srcs(../src/*Hwui* ../src/*android*)
-endif()
-if (NOT APPLE)
- remove_srcs(../src/*darwin*
- ../src/ports/SkImageDecoder_CG.cpp
- ../src/utils/mac/*
- ../src/*_mac*)
-endif()
# Remove processor-specific source files.
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ARM)
@@ -128,6 +111,7 @@ set_source_files_properties(${sse41_srcs} PROPERTIES COMPILE_FLAGS -msse4.1)
# 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 (Lua)
find_package (ZLIB)
# No find_package for libwebp as far as I can tell, so simulate it here.
@@ -148,6 +132,13 @@ endif()
# TODO: macro away this if (found) ... else() ... endif() stuff.
+if (EXPAT_FOUND)
+ list (APPEND private_includes ${EXPAT_INCLUDE_DIRS})
+ list (APPEND libs ${EXPAT_LIBRARIES})
+else()
+ remove_srcs (../src/ports/SkFontMgr_android_parser.cpp)
+endif()
+
if (GIF_FOUND)
list (APPEND private_includes ${GIF_INCLUDE_DIRS})
list (APPEND libs ${GIF_LIBRARIES})
« no previous file with comments | « no previous file | src/device/xps/SkXPSDevice.cpp » ('j') | src/ports/SkFontMgr_android_factory.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698