Fix she/CMakeLists.txt to link with skia with GPU

This commit is contained in:
David Capello 2016-07-11 12:30:09 -03:00
parent b0385d437f
commit 691ff2c08a

View File

@ -87,30 +87,30 @@ if(USE_SKIA_BACKEND)
find_library(SKIA_SFNT_LIBRARY skia_sfnt PATH "${SKIA_BUILD_OUT_DIR}")
find_library(SKIA_UTILS_LIBRARY skia_utils PATH "${SKIA_BUILD_OUT_DIR}")
find_library(SKIA_GPU_LIBRARY skia_skgpu PATH "${SKIA_BUILD_OUT_DIR}")
if(SKIA_GPU_LIBRARY_FOUND)
if(SKIA_GPU_LIBRARY)
add_definitions(-DSK_SUPPORT_GPU=1)
else()
add_definitions(-DSK_SUPPORT_GPU=0)
set(SKIA_GPU_LIBRARY "")
endif()
find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
if(NOT SKIA_ETC1_LIBRARY_FOUND)
find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}")
if(NOT SKIA_ETC1_LIBRARY)
set(SKIA_ETC1_LIBRARY "")
endif()
find_library(SKIA_FLAGS_LIBRARY flags PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
if(NOT SKIA_FLAGS_LIBRARY_FOUND)
find_library(SKIA_FLAGS_LIBRARY flags PATH "${SKIA_BUILD_OUT_DIR}")
if(NOT SKIA_FLAGS_LIBRARY)
set(SKIA_FLAGS_LIBRARY "")
endif()
find_library(SKIA_SKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
if(NOT SKIA_SKKTX_LIBRARY_FOUND)
find_library(SKIA_SKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}")
if(NOT SKIA_SKKTX_LIBRARY)
set(SKIA_SKKTX_LIBRARY "")
endif()
if(WIN32)
if(SKIA_GPU_LIBRARY_FOUND)
if(SKIA_GPU_LIBRARY)
find_library(SKIA_OPENGL_LIBRARY opengl32)
find_library(SKIA_LIBEGL_LIBRARY libEGL.dll PATH "${SKIA_BUILD_OUT_DIR}")
if(SKIA_LIBEGL_LIBRARY)
@ -118,7 +118,7 @@ if(USE_SKIA_BACKEND)
endif()
endif()
else()
if(SKIA_GPU_LIBRARY_FOUND)
if(SKIA_GPU_LIBRARY)
find_library(SKIA_OPENGL_LIBRARY opengl)
endif()
endif()
@ -134,7 +134,7 @@ if(USE_SKIA_BACKEND)
find_path(SKIA_CORE_INCLUDE_DIR SkCanvas.h HINTS "${SKIA_DIR}/include/core")
find_path(SKIA_UTILS_INCLUDE_DIR SkRandom.h HINTS "${SKIA_DIR}/include/utils")
find_path(SKIA_EFFECTS_INCLUDE_DIR SkBitmapSource.h HINTS "${SKIA_DIR}/include/effects")
if(SKIA_GPU_LIBRARY_FOUND)
if(SKIA_GPU_LIBRARY)
find_path(SKIA_GPU_INCLUDE_DIR SkGr.h HINTS "${SKIA_DIR}/include/gpu")
find_path(SKIA_ANGLE_INCLUDE_DIR angle_gl.h HINTS "${SKIA_DIR}/third_party/externals/angle2/include")
endif()
@ -144,7 +144,7 @@ if(USE_SKIA_BACKEND)
${SKIA_CORE_INCLUDE_DIR}
${SKIA_PORTS_INCLUDE_DIR}
${SKIA_UTILS_INCLUDE_DIR})
if(SKIA_GPU_LIBRARY_FOUND)
if(SKIA_GPU_LIBRARY)
include_directories(${SKIA_GPU_INCLUDE_DIR})
if(WIN32)
include_directories(${SKIA_ANGLE_INCLUDE_DIR})