AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Compile in OSMesa on Linux, if found.

Browse Source 
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot

Review URL: https://codereview.chromium.org/1353383003
This commit is contained in:
halcanary 2015-09-21 09:42:23 -07:00 committed by Commit bot
parent 0fc1dbe592
commit 4ae26258ef
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/CMakeLists.txt
View File

@ -100,7 +100,6 @@ remove_srcs(
../src/gpu/gl/command_buffer/* ../src/gpu/gl/command_buffer/*
../src/gpu/gl/egl/* ../src/gpu/gl/egl/*
../src/gpu/gl/iOS/* ../src/gpu/gl/iOS/*
../src/gpu/gl/mesa/*
../src/opts/SkBitmapProcState_opts_none.cpp ../src/opts/SkBitmapProcState_opts_none.cpp
../src/opts/SkBlitMask_opts_none.cpp ../src/opts/SkBlitMask_opts_none.cpp
../src/opts/SkBlitRow_opts_none.cpp ../src/opts/SkBlitRow_opts_none.cpp
@ -125,6 +124,8 @@ find_package (ZLIB)
# No find_package for libwebp as far as I can tell, so simulate it here. # No find_package for libwebp as far as I can tell, so simulate it here.
find_path (WEBP_INCLUDE_DIRS "webp/decode.h") find_path (WEBP_INCLUDE_DIRS "webp/decode.h")
find_library (WEBP_LIBRARIES webp) find_library (WEBP_LIBRARIES webp)
find_path (OSMESA_INCLUDE_DIRS "GL/osmesa.h")
find_library(OSMESA_LIBRARIES "OSMesa")
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
find_package (Freetype) find_package (Freetype)
@ -196,6 +197,16 @@ if (APPLE)
list (APPEND libs ${APPLICATION_SERVICES_FRAMEWORK}) list (APPEND libs ${APPLICATION_SERVICES_FRAMEWORK})
endif() endif()
if (OSMESA_LIBRARIES AND OSMESA_INCLUDE_DIRS)
list (APPEND libs ${OSMESA_LIBRARIES})
list (APPEND private_includes ${OSMESA_INCLUDE_DIRS})
list (APPEND public_defines "-DSK_MESA=1")
message("-- Found OSMesa: " ${OSMESA_LIBRARIES})
else()
remove_srcs(../src/gpu/gl/mesa/*)
message("-- Could NOT find OSMesa")
endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
list (APPEND libs ${OPENGL_LIBRARIES}) list (APPEND libs ${OPENGL_LIBRARIES})
@ -204,9 +215,11 @@ list (APPEND libs ${OPENGL_LIBRARIES})
# not so much that we think Skia is a good candidate to ship as a shared library. # not so much that we think Skia is a good candidate to ship as a shared library.
add_library (skia SHARED ${srcs}) add_library (skia SHARED ${srcs})
list (APPEND private_defines "-DSKIA_DLL")
target_compile_definitions(skia target_compile_definitions(skia
PUBLIC PUBLIC ${public_defines}
PRIVATE -DSKIA_DLL) PRIVATE ${private_defines})
target_include_directories(skia target_include_directories(skia
PUBLIC ${public_includes} PUBLIC ${public_includes}