summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-07-16 09:54:55 +0000
committerEven Rouault <even.rouault@spatialys.com>2019-07-16 09:54:55 +0000
commitd8e707a953d1a7be5293ebbe6550213ddc00596c (patch)
treecd90ee298429ce409e513f3bbd48bed1b3f994a7
parenta21714f0287174a693e40b7a6b6ad21bf5fd4f09 (diff)
parent5e7e9b597f5549a7a015302b8e11ad647b0eeae9 (diff)
downloadlibtiff-git-d8e707a953d1a7be5293ebbe6550213ddc00596c.tar.gz
Merge branch 'cmake_amd64' into 'master'
CMakeLists.txt: properly set value of HOST_FILLORDER to LSB2MSB for Windows CMake builds See merge request libtiff/libtiff!87
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 721ebb30..f9a43019 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,6 +395,8 @@ endif()
set(HOST_FILLORDER FILLORDER_MSB2LSB)
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i.*86.*" OR
CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*" OR
+ # AMD64 on Windows
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "AMD64" OR
CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64.*")
set(HOST_FILLORDER FILLORDER_LSB2MSB)
endif()