From cc77d634c2a69512015880a5968147f276f5ab95 Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Tue, 14 Jun 2016 00:56:53 +0500 Subject: [PATCH] Force to build internal libraries as STATIC object Preventing to some compilation errors where BUILD_SHARED_LIBS incorrectly enabled (#698). --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06f532f94..abd935f88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,11 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal") # Aseprite project project(aseprite C CXX) +# This required for KDE/Qt destop integration, which sets BUILD_SHARED_LIBS to +# TRUE by defualt +set(BUILD_SHARED_LIBS off) + + ###################################################################### # Options (these can be specified in cmake command line or modifying # CMakeCache.txt) @@ -182,7 +187,6 @@ else() ${CMAKE_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file endif() include_directories(${ZLIB_INCLUDE_DIRS}) -message(${ZLIB_INCLUDE_DIRS}) # libpng if(USE_SHARED_LIBPNG)