diff options
Diffstat (limited to 'libs/cairo-1.16.0')
| -rw-r--r-- | libs/cairo-1.16.0/CMakeLists.txt | 24 | ||||
| m--------- | libs/cairo-1.16.0/libpng | 0 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libs/cairo-1.16.0/CMakeLists.txt b/libs/cairo-1.16.0/CMakeLists.txt index 8683262..fd1ae4d 100644 --- a/libs/cairo-1.16.0/CMakeLists.txt +++ b/libs/cairo-1.16.0/CMakeLists.txt @@ -3,9 +3,6 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") -find_package(Pixman REQUIRED) -find_package(PNG REQUIRED) -find_package(ZLIB REQUIRED) find_package(Freetype) find_package(Threads) find_package(Fontconfig) @@ -13,7 +10,21 @@ find_package(Fontconfig) include(Configure_config.cmake) include(Configure_features.cmake) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/libs/pixman-0.40.0/pixman + ${CMAKE_SOURCE_DIR}/libs/assimp/contrib/zlib + ${CMAKE_CURRENT_LIST_DIR}/libpng +) +link_directories( + ${CMAKE_SOURCE_DIR}/libs/pixman-0.40.0/pixman + ${CMAKE_SOURCE_DIR}/libs/assimp/contrib/zlib + ${CMAKE_BINARY_DIR}/libs/assimp/contrib/zlib + ${CMAKE_CURRENT_LIST_DIR}/libpng + ${CMAKE_CURRENT_BINARY_DIR}/libpng +) + +add_subdirectory(libpng) if(CAIRO_HAS_PTHREAD) list(APPEND CAIRO_LIBS -lpthread) @@ -23,8 +34,9 @@ if (WIN32) set(CAIRO_LIBS gdi32 msimg32 user32 winmm) endif() -include_directories(${PIXMAN_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) -list(APPEND CAIRO_LIBS ${PIXMAN_LIBRARY} ${PNG_LIBRARY} ${ZLIB_LIBRARY}) + + +list(APPEND CAIRO_LIBS pixman-1_static png_static zlibstatic) if(FONTCONFIG_FOUND) list(APPEND CAIRO_LIBS ${FONTCONFIG_LIBRARY}) diff --git a/libs/cairo-1.16.0/libpng b/libs/cairo-1.16.0/libpng new file mode 160000 +Subproject 420243c6b5a819b138f8f032fba4b9a71c0a981 |