From 4cb883b6b2119385bbb4d1af050b491a62f52e4a Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Sun, 31 May 2020 13:15:40 -0600
Subject: Deps: Update OIIO + ImageLibs + OSL + Helpers

This is the cluster of OIIO and friends , since they are all kinda tangled best to deal with this as a single unit

OIIO 2.1.15.0
png 1.6.37
jpeg 2.0.4
opencolorio 1.1.1
tiff 4.1.0
OSL 1.10.10
pugixml 1.10
openjpeg 2.3.1

Differential Revision: https://developer.blender.org/D7727
Reviewed by: brecht
---
 build_files/build_environment/cmake/jpeg.cmake | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'build_files/build_environment/cmake/jpeg.cmake')

diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake
index 0d611219353..e0200d84897 100644
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -42,20 +42,17 @@ if(WIN32)
     set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
   endif()
 else(WIN32)
-  # autoconf for unix
-  if(APPLE)
-    set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
-  else()
-    set(JPEG_EXTRA_ARGS --with-jpeg8)
-  endif()
+  # cmake for unix
+  set(JPEG_EXTRA_ARGS
+    -DWITH_JPEG8=ON
+    -DENABLE_STATIC=ON
+    -DENABLE_SHARED=OFF
+    -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
 
   ExternalProject_Add(external_jpeg
     URL ${JPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH MD5=${JPEG_HASH}
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
-    BUILD_IN_SOURCE 1
-    BUILD_COMMAND ${CONFIGURE_ENV} && make install
     PREFIX ${BUILD_DIR}/jpg
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/jpg
-- 
cgit v1.2.3