From f1173cf446eee983f42dce05277de2484319fc8e Mon Sep 17 00:00:00 2001 From: Seth Willits Date: Sat, 20 Dec 2014 14:54:05 -0800 Subject: [PATCH] misc: updated OS X build settings for libjpeg-turbo --- CMakeLists.txt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f403911a..c7640b8bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,11 +381,19 @@ elseif(UNIX) #----------------------------------------------------------------- if(BUNDLED_JPEG) if(CROSS_COMPILE32) - add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a - COMMAND make clean || true - COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-pc-linux-gnu && make - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo - ) + if(APPLE) + add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a + COMMAND make clean || true + COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-apple-darwin && make + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo + ) + else() + add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a + COMMAND make clean || true + COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-pc-linux-gnu && make + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo + ) + endif() else(CROSS_COMPILE32) add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a COMMAND make clean || true