liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require libtiff >= 4.0.4

Browse Source 
Compilation fails when using libtiff < 4.0.4 on PHOTOMETRIC_CFA not
being declared. This commit introduces a minimum libtiff requirement of
4.0.4, which in turn required making cmake-2.8.8 the minimum required
version so as to avoid having to bundle findTIFF.cmake.
Closes #4653
This commit is contained in:
Morgan Hardwood
2018-07-04 21:23:18 +02:00
parent cc34d5ad1e
commit ba3932d816
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -1,10 +1,8 @@
if(WIN32) if(APPLE)
cmake_minimum_required(VERSION 2.8.4)
elseif(APPLE)
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.3)
CMAKE_POLICY(SET CMP0025 NEW) CMAKE_POLICY(SET CMP0025 NEW)
else() else()
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8.8)
endif() endif()
# Must stay before the PROJECT() command: # Must stay before the PROJECT() command:
@@ -318,9 +316,9 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
pkg_check_modules(EXPAT REQUIRED expat>=2.1) pkg_check_modules(EXPAT REQUIRED expat>=2.1)
pkg_check_modules(FFTW3F REQUIRED fftw3f) pkg_check_modules(FFTW3F REQUIRED fftw3f)
pkg_check_modules(IPTCDATA REQUIRED libiptcdata) pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(TIFF REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
if(WITH_SYSTEM_KLT) if(WITH_SYSTEM_KLT)
find_package(KLT REQUIRED) find_package(KLT REQUIRED)