mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 03:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1035 from winterheart/cmake

Browse Source 
CMake improvements
This commit is contained in:
David Capello 2016-03-26 09:21:10 -03:00
commit 3b7674a6c7
3 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
CMakeLists.txt
View File

@ -157,30 +157,24 @@ endif()
# zlib # zlib
if(USE_SHARED_ZLIB) if(USE_SHARED_ZLIB)
find_package(ZLIB) find_package(ZLIB REQUIRED)
if(NOT ZLIB_FOUND)
message(FATAL_ERROR "zlib not found")
endif()
else() else()
set(ZLIB_LIBRARIES zlib) set(ZLIB_LIBRARIES zlib)
set(ZLIB_INCLUDE_DIR ${ZLIB_DIR}) set(ZLIB_INCLUDE_DIRS ${ZLIB_DIR})
# Zlib generated zconf.h file # Zlib generated zconf.h file
include_directories(${CMAKE_BINARY_DIR}/third_party/zlib) include_directories(${CMAKE_BINARY_DIR}/third_party/zlib)
endif() endif()
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIRS})
# libpng # libpng
if(USE_SHARED_LIBPNG) if(USE_SHARED_LIBPNG)
find_package(PNG) find_package(PNG REQUIRED)
if(NOT PNG_FOUND)
message(FATAL_ERROR "libpng not found")
endif()
add_definitions(${PNG_DEFINITIONS}) add_definitions(${PNG_DEFINITIONS})
else() else()
set(PNG_LIBRARIES libpng) set(PNG_LIBRARIES libpng)
set(PNG_INCLUDE_DIR ${LIBPNG_DIR}) set(PNG_INCLUDE_DIRS ${LIBPNG_DIR})
endif() 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 add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
# libwebp # libwebp
@ -222,35 +216,28 @@ include_directories(${PIXMAN_INCLUDE_DIR})
# freetype # freetype
if(USE_SHARED_FREETYPE) if(USE_SHARED_FREETYPE)
find_library(FREETYPE_LIBRARY NAMES freetype) find_package(Freetype REQUIRED)
find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h)
else() else()
set(FREETYPE_LIBRARY freetype) set(FREETYPE_LIBRARIES freetype)
set(FREETYPE_INCLUDE_DIR ${FREETYPE_DIR}/include) set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include)
endif() endif()
include_directories(${FREETYPE_INCLUDE_DIR}) include_directories(${FREETYPE_INCLUDE_DIRS})
if(USE_SHARED_GIFLIB) if(USE_SHARED_GIFLIB)
find_package(GIF REQUIRED) find_package(GIF REQUIRED)
if(NOT GIF_FOUND)
message(FATAL_ERROR "giflib not found")
endif()
else() else()
set(GIF_LIBRARIES giflib) set(GIF_LIBRARIES giflib)
set(GIF_INCLUDE_DIR ${GIFLIB_DIR}/lib) set(GIF_INCLUDE_DIRS ${GIFLIB_DIR}/lib)
endif() endif()
include_directories(${GIF_INCLUDE_DIR}) include_directories(${GIF_INCLUDE_DIRS})
if(USE_SHARED_JPEGLIB) if(USE_SHARED_JPEGLIB)
find_package(JPEG) find_package(JPEG REQUIRED)
if(NOT JPEG_FOUND)
message(FATAL_ERROR "jpeg not found")
endif()
else() else()
set(JPEG_LIBRARIES jpeg) set(JPEG_LIBRARIES jpeg)
set(JPEG_INCLUDE_DIR ${LIBJPEG_DIR}) set(JPEG_INCLUDE_DIRS ${LIBJPEG_DIRS})
endif() endif()
include_directories(${JPEG_INCLUDE_DIR}) include_directories(${JPEG_INCLUDE_DIRS})
if(USE_ALLEG4_BACKEND) if(USE_ALLEG4_BACKEND)
if(USE_SHARED_LIBLOADPNG) if(USE_SHARED_LIBLOADPNG)
@ -264,13 +251,12 @@ if(USE_ALLEG4_BACKEND)
endif() endif()
if(USE_SHARED_CURL) if(USE_SHARED_CURL)
find_library(LIBCURL_LIBRARY NAMES curl) find_package(CURL REQUIRED)
find_path(LIBCURL_INCLUDE_DIR NAMES curl/curl.h)
else() else()
set(LIBCURL_LIBRARY libcurl) set(CURL_LIBRARIES libcurl)
set(LIBCURL_INCLUDE_DIR ${CURL_DIR}/include) set(CURL_INCLUDE_DIRS ${CURL_DIR}/include)
endif() endif()
include_directories(${LIBCURL_INCLUDE_DIR}) include_directories(${CURL_INCLUDE_DIRS})
# simpleini # simpleini
include_directories(${SIMPLEINI_DIR}) include_directories(${SIMPLEINI_DIR})
@ -323,17 +309,11 @@ endif()
if(UNIX AND NOT APPLE AND NOT BEOS) if(UNIX AND NOT APPLE AND NOT BEOS)
# Pthreads # Pthreads
find_package(Threads) find_package(Threads REQUIRED)
if(NOT CMAKE_USE_PTHREADS_INIT)
message(FATAL_ERROR "Unix port requires pthreads support.")
endif()
list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT}) list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
# X11 # X11
find_package(X11) find_package(X11 REQUIRED)
if(NOT X11_FOUND)
message(FATAL_ERROR "Unix port requires X11 (e.g. libx11-dev).")
endif()
include_directories(SYSTEM ${X11_INCLUDE_DIR}) include_directories(SYSTEM ${X11_INCLUDE_DIR})
list(APPEND PLATFORM_LIBS ${X11_LIBRARIES}) list(APPEND PLATFORM_LIBS ${X11_LIBRARIES})

3
src/app/CMakeLists.txt
View File

@ -446,12 +446,13 @@ target_link_libraries(app-lib
ui-lib ui-lib
undo-lib undo-lib
${TINYXML_LIBRARY} ${TINYXML_LIBRARY}
${CURL_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${GIF_LIBRARIES} ${GIF_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${WEBP_LIBRARIES} ${WEBP_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${FREETYPE_LIBRARY}) ${FREETYPE_LIBRARIES})
if(ENABLE_UPDATER) if(ENABLE_UPDATER)
target_link_libraries(app-lib updater-lib) target_link_libraries(app-lib updater-lib)

2
src/net/CMakeLists.txt
View File

@ -7,4 +7,4 @@ add_library(net-lib
http_response.cpp) http_response.cpp)
target_link_libraries(net-lib target_link_libraries(net-lib
${LIBCURL_LIBRARY}) ${CURL_LIBRARIES})