[aseprite] 109/196: Using FOO_LIBRARIES and FOO_HEADERS from system cmake.

[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 3e9de78fa26971f0d2e57b09f971c17714640022
Author: Azamat H. Hackimov <azamat.hackimov at gmail.com>
Date:   Sat Mar 26 14:40:16 2016 +0500

    Using FOO_LIBRARIES and FOO_HEADERS from system cmake.
    
    Fixes issue #864 (FREETYPE_INCLUDE_DIRS has not been added to search path)
---
 CMakeLists.txt         | 28 ++++++++++++++--------------
 src/app/CMakeLists.txt |  2 +-
 src/net/CMakeLists.txt |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2280f9c..5fb6891 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,11 +160,11 @@ if(USE_SHARED_ZLIB)
   find_package(ZLIB REQUIRED)
 else()
   set(ZLIB_LIBRARIES zlib)
-  set(ZLIB_INCLUDE_DIR ${ZLIB_DIR})
+  set(ZLIB_INCLUDE_DIRS ${ZLIB_DIR})
   # Zlib generated zconf.h file
   include_directories(${CMAKE_BINARY_DIR}/third_party/zlib)
 endif()
-include_directories(${ZLIB_INCLUDE_DIR})
+include_directories(${ZLIB_INCLUDE_DIRS})
 
 # libpng
 if(USE_SHARED_LIBPNG)
@@ -172,9 +172,9 @@ if(USE_SHARED_LIBPNG)
   add_definitions(${PNG_DEFINITIONS})
 else()
   set(PNG_LIBRARIES libpng)
-  set(PNG_INCLUDE_DIR ${LIBPNG_DIR})
+  set(PNG_INCLUDE_DIRS ${LIBPNG_DIR})
 endif()
-include_directories(${PNG_INCLUDE_DIR})
+include_directories(${PNG_INCLUDE_DIRS})
 add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
 
 # libwebp
@@ -218,26 +218,26 @@ include_directories(${PIXMAN_INCLUDE_DIR})
 if(USE_SHARED_FREETYPE)
   find_package(Freetype REQUIRED)
 else()
-  set(FREETYPE_LIBRARY freetype)
-  set(FREETYPE_INCLUDE_DIR ${FREETYPE_DIR}/include)
+  set(FREETYPE_LIBRARIES freetype)
+  set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include)
 endif()
-include_directories(${FREETYPE_INCLUDE_DIR})
+include_directories(${FREETYPE_INCLUDE_DIRS})
 
 if(USE_SHARED_GIFLIB)
   find_package(GIF REQUIRED)
 else()
   set(GIF_LIBRARIES giflib)
-  set(GIF_INCLUDE_DIR ${GIFLIB_DIR}/lib)
+  set(GIF_INCLUDE_DIRS ${GIFLIB_DIR}/lib)
 endif()
-include_directories(${GIF_INCLUDE_DIR})
+include_directories(${GIF_INCLUDE_DIRS})
 
 if(USE_SHARED_JPEGLIB)
   find_package(JPEG REQUIRED)
 else()
   set(JPEG_LIBRARIES jpeg)
-  set(JPEG_INCLUDE_DIR ${LIBJPEG_DIR})
+  set(JPEG_INCLUDE_DIRS ${LIBJPEG_DIRS})
 endif()
-include_directories(${JPEG_INCLUDE_DIR})
+include_directories(${JPEG_INCLUDE_DIRS})
 
 if(USE_ALLEG4_BACKEND)
   if(USE_SHARED_LIBLOADPNG)
@@ -253,10 +253,10 @@ endif()
 if(USE_SHARED_CURL)
   find_package(CURL REQUIRED)
 else()
-  set(LIBCURL_LIBRARY libcurl)
-  set(LIBCURL_INCLUDE_DIR ${CURL_DIR}/include)
+  set(LIBCURL_LIBRARIES libcurl)
+  set(LIBCURL_INCLUDE_DIRS ${CURL_DIR}/include)
 endif()
-include_directories(${LIBCURL_INCLUDE_DIR})
+include_directories(${LIBCURL_INCLUDE_DIRS})
 
 # simpleini
 include_directories(${SIMPLEINI_DIR})
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index fcc4136..dde05da 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -451,7 +451,7 @@ target_link_libraries(app-lib
   ${PNG_LIBRARIES}
   ${WEBP_LIBRARIES}
   ${ZLIB_LIBRARIES}
-  ${FREETYPE_LIBRARY})
+  ${FREETYPE_LIBRARIES})
 
 if(ENABLE_UPDATER)
   target_link_libraries(app-lib updater-lib)
diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt
index 7913956..7ed6a27 100644
--- a/src/net/CMakeLists.txt
+++ b/src/net/CMakeLists.txt
@@ -7,4 +7,4 @@ add_library(net-lib
   http_response.cpp)
 
 target_link_libraries(net-lib
-  ${LIBCURL_LIBRARY})
+  ${LIBCURL_LIBRARIES})

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