From b8b805ef47fcc76275d3fd608a345da197221311 Mon Sep 17 00:00:00 2001 From: rude Date: Mon, 21 Apr 2014 15:10:35 +0200 Subject: [PATCH] libjpeg-turbo 1.3.1: Build just the static library. --- libs/libjpeg-turbo/CMakeLists.txt | 11 ++++++++++- libs/libjpeg-turbo/sharedlib/CMakeLists.txt | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/libjpeg-turbo/CMakeLists.txt b/libs/libjpeg-turbo/CMakeLists.txt index d3c09728..53ba539e 100644 --- a/libs/libjpeg-turbo/CMakeLists.txt +++ b/libs/libjpeg-turbo/CMakeLists.txt @@ -196,7 +196,7 @@ if(WITH_JAVA) add_subdirectory(java) endif() -add_subdirectory(sharedlib) +#add_subdirectory(sharedlib) add_library(jpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS}) if(NOT MSVC) @@ -212,6 +212,9 @@ if(WITH_JAVA) include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) endif() +if(NOT MEGA) +# Don't build shared library version. + add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES}) set_target_properties(turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE) if(MINGW) @@ -220,6 +223,8 @@ endif() target_link_libraries(turbojpeg jpeg-static) set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "") +endif() + add_library(turbojpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS} turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c) if(NOT MSVC) @@ -229,6 +234,10 @@ if(WITH_SIMD) add_dependencies(turbojpeg-static simd) endif() +if(MEGA) + return() +endif() + add_executable(tjunittest tjunittest.c tjutil.c) target_link_libraries(tjunittest turbojpeg) diff --git a/libs/libjpeg-turbo/sharedlib/CMakeLists.txt b/libs/libjpeg-turbo/sharedlib/CMakeLists.txt index cd3f2687..c768cfcc 100644 --- a/libs/libjpeg-turbo/sharedlib/CMakeLists.txt +++ b/libs/libjpeg-turbo/sharedlib/CMakeLists.txt @@ -42,6 +42,10 @@ if(WITH_SIMD) add_dependencies(jpeg simd) endif() +if(MEGA) + return() +endif() + add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c ../rdswitch.c ../rdtarga.c) set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS