Skip to content

Commit

Permalink
misc: updated OS X build settings for libjpeg-turbo
Browse files Browse the repository at this point in the history
  • Loading branch information
swillits committed Dec 20, 2014
1 parent fc38b85 commit f1173cf
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f1173cf

Please sign in to comment.