From 6074166290cad96abf2f6e23267061c5b5f6b433 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Fri, 19 Jun 2015 08:51:24 +0200
Subject: [PATCH] ENH:use superbuild version of libjpeg if USE_SYSTEM_JPEG is
off
---
SuperBuild/CMake/External_tiff.cmake | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/SuperBuild/CMake/External_tiff.cmake b/SuperBuild/CMake/External_tiff.cmake
index 0418899b32..8eb9316b82 100644
--- a/SuperBuild/CMake/External_tiff.cmake
+++ b/SuperBuild/CMake/External_tiff.cmake
@@ -21,9 +21,17 @@ else()
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
# set proj back to its original value
set(proj TIFF)
-
- ADD_SUPERBUILD_CONFIGURE_VAR(ZLIB_INCLUDE_DIR --with-zlib-include-dir)
-
+
+ set(TIFF_SB_CONFIG)
+ if(NOT USE_SYSTEM_ZLIB)
+ list(APPEND TIFF_SB_CONFIG "--with-zlib-include-dir=${SB_INSTALL_PREFIX}/include")
+ list(APPEND TIFF_SB_CONFIG "--with-zlib-lib-dir=${SB_INSTALL_PREFIX}/lib")
+ endif()
+ if(NOT USE_SYSTEM_JPEG)
+ list(APPEND TIFF_SB_CONFIG "--with-jpeg-include-dir=${SB_INSTALL_PREFIX}/include")
+ list(APPEND TIFF_SB_CONFIG "--with-jpeg-lib-dir=${SB_INSTALL_PREFIX}/lib")
+ endif()
+
if(MSVC)
#is JPEG required for linux also?
--
GitLab