[aseprite] 162/196: Fix compilation problems on OS X with skia back-end

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 00be81dfa8298e0953a003ea40b9c9e212c98b9c
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Apr 8 13:08:34 2016 -0300

    Fix compilation problems on OS X with skia back-end
---
 src/she/CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
index f5fde2e..727c39b 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
@@ -95,12 +95,20 @@ if(USE_SKIA_BACKEND)
   endif()
 
   find_library(SKIA_ETC1_LIBRARY etc1 PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
+  if(NOT SKIA_ETC1_LIBRARY_FOUND)
+    set(SKIA_ETC1_LIBRARY "")
+  endif()
+
   find_library(SKIA_FLAGS_LIBRARY flags PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
   if(NOT SKIA_FLAGS_LIBRARY_FOUND)
     set(SKIA_FLAGS_LIBRARY "")
   endif()
 
-  find_library(SKIA_LIBSKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
+  find_library(SKIA_SKKTX_LIBRARY SkKTX PATH "${SKIA_BUILD_OUT_DIR}/obj/gyp")
+  if(NOT SKIA_SKKTX_LIBRARY_FOUND)
+    set(SKIA_SKKTX_LIBRARY "")
+  endif()
+
   if(WIN32)
     if(SKIA_GPU_LIBRARY_FOUND)
       find_library(SKIA_OPENGL_LIBRARY opengl32)
@@ -150,7 +158,7 @@ if(USE_SKIA_BACKEND)
   set(SKIA_LIBRARIES
     ${SKIA_ETC1_LIBRARY}
     ${SKIA_FLAGS_LIBRARY}
-    ${SKIA_LIBSKKTX_LIBRARY}
+    ${SKIA_SKKTX_LIBRARY}
     ${SKIA_CORE_LIBRARY}
     ${SKIA_IMAGES_LIBRARY}
     ${SKIA_OPTS_LIBRARY}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git