Rename SKIA_OPENGL_LIBRARY variable in src/she/CMakeLists.txt

This commit is contained in:
David Capello 2015-10-06 16:39:56 -03:00
parent 066a8dffcc
commit f98c4df79a

View File

@ -84,7 +84,7 @@ if(USE_SKIA_BACKEND)
if(WIN32) if(WIN32)
find_library(SKIA_ETC1_LIBRARY libetc1 PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp") find_library(SKIA_ETC1_LIBRARY libetc1 PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
find_library(SKIA_LIBSKKTX_LIBRARY libSkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp") find_library(SKIA_LIBSKKTX_LIBRARY libSkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
find_library(SKIA_OPENGL32_LIBRARY opengl32) find_library(SKIA_OPENGL_LIBRARY opengl32)
find_library(SKIA_LIBEGL_LIBRARY libEGL.dll.lib PATH "${SKIA_BUILD_OUT_DIR}") find_library(SKIA_LIBEGL_LIBRARY libEGL.dll.lib PATH "${SKIA_BUILD_OUT_DIR}")
if(SKIA_LIBEGL_LIBRARY) if(SKIA_LIBEGL_LIBRARY)
add_definitions(-DSK_ANGLE=1) add_definitions(-DSK_ANGLE=1)
@ -92,6 +92,7 @@ if(USE_SKIA_BACKEND)
else() else()
find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}") find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}")
find_library(SKIA_LIBSKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}") find_library(SKIA_LIBSKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}")
find_library(SKIA_OPENGL_LIBRARY opengl)
endif() endif()
find_path(SKIA_CONFIG_INCLUDE_DIR SkUserConfig.h HINTS "${SKIA_DIR}/include/config") find_path(SKIA_CONFIG_INCLUDE_DIR SkUserConfig.h HINTS "${SKIA_DIR}/include/config")
@ -114,7 +115,7 @@ if(USE_SKIA_BACKEND)
set(SKIA_LIBRARIES set(SKIA_LIBRARIES
${SKIA_ETC1_LIBRARY} ${SKIA_ETC1_LIBRARY}
${SKIA_LIBSKKTX_LIBRARY} ${SKIA_LIBSKKTX_LIBRARY}
${SKIA_OPENGL32_LIBRARY} ${SKIA_OPENGL_LIBRARY}
${SKIA_LIBEGL_LIBRARY} ${SKIA_LIBEGL_LIBRARY}
${SKIA_CORE_LIBRARY} ${SKIA_CORE_LIBRARY}
${SKIA_EFFECTS_LIBRARY} ${SKIA_EFFECTS_LIBRARY}