Require libtiff >= 4.0.4
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:
@@ -1,10 +1,8 @@
|
||||
if(WIN32)
|
||||
cmake_minimum_required(VERSION 2.8.4)
|
||||
elseif(APPLE)
|
||||
if(APPLE)
|
||||
cmake_minimum_required(VERSION 3.3)
|
||||
CMAKE_POLICY(SET CMP0025 NEW)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
cmake_minimum_required(VERSION 2.8.8)
|
||||
endif()
|
||||
|
||||
# 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(FFTW3F REQUIRED fftw3f)
|
||||
pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
|
||||
pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
find_package(TIFF REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
if(WITH_SYSTEM_KLT)
|
||||
find_package(KLT REQUIRED)
|
||||
|
Reference in New Issue
Block a user