Create option to build with shared tinyxml (thanks to Tobias Hansen).

This commit is contained in:
David Capello 2012-03-19 14:04:24 -03:00
parent d2b11dda2b
commit 7115806dc4
3 changed files with 18 additions and 3 deletions

View File

@ -35,6 +35,7 @@ option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off)
option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
option(ENABLE_UPDATER "Enable automatic check for updates" on)

View File

@ -15,8 +15,8 @@ set(aseprite_libraries aseprite-library undo-lib filters-lib gui-lib gfx-lib bas
include_directories(. .. ../third_party)
# Third-party libraries
set(libs3rdparty loadpng tinyxml)
include_directories(${LOADPNG_DIR} ${TINYXML_DIR})
set(libs3rdparty loadpng)
include_directories(${LOADPNG_DIR})
if(USE_SHARED_JPEGLIB)
find_package(JPEG)
@ -63,6 +63,17 @@ else()
include_directories(${GIFLIB_DIR}/lib)
endif()
if(USE_SHARED_TINYXML)
find_library(LIBTINYXML_LIBRARY NAMES tinyxml)
find_path(LIBTINYXML_INCLUDE_DIR NAMES tinyxml.h)
set(libs3rdparty ${libs3rdparty} ${LIBTINYXML_LIBRARY})
include_directories(${LIBTINYXML_INCLUDE_DIR})
else()
set(libs3rdparty ${libs3rdparty} tinyxml)
include_directories(${TINYXML_DIR})
endif()
if (CMAKE_USE_PTHREADS_INIT)
set(sys_libs ${sys_libs} ${CMAKE_THREAD_LIBS_INIT})
endif()

View File

@ -25,10 +25,13 @@ if(NOT USE_SHARED_GIFLIB)
add_subdirectory(giflib)
endif()
if(NOT USE_SHARED_TINYXML)
add_subdirectory(tinyxml)
endif()
if(ENABLE_UPDATER AND NOT USE_SHARED_CURL)
add_subdirectory(curl)
endif()
add_subdirectory(gtest)
add_subdirectory(loadpng)
add_subdirectory(tinyxml)