From 1a57ec7ba84f84811f326104046617351a5907c2 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Tue, 28 Jun 2022 17:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4cmake=20=E5=A4=B4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E8=B0=83=E6=95=B4=20tiff=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E9=87=8D=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/3rdparty/tiff/include/tiff.h | 2 ++
 hgdriver/ImageProcess/CMakeLists.txt  | 7 ++++---
 hgdriver/hgdev/CMakeLists.txt         | 3 ++-
 hgdriver/wrapper/CMakeLists.txt       | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hgdriver/3rdparty/tiff/include/tiff.h b/hgdriver/3rdparty/tiff/include/tiff.h
index 5b0a0c9..0ee369c 100644
--- a/hgdriver/3rdparty/tiff/include/tiff.h
+++ b/hgdriver/3rdparty/tiff/include/tiff.h
@@ -72,8 +72,10 @@ typedef TIFF_UINT16_T uint16;
 typedef TIFF_INT32_T  int32;
 typedef TIFF_UINT32_T uint32;
 
+#ifdef WIN32 
 typedef TIFF_INT64_T  int64;
 typedef TIFF_UINT64_T uint64;
+#endif
 
 /*
  * Some types as promoted in a variable argument list
diff --git a/hgdriver/ImageProcess/CMakeLists.txt b/hgdriver/ImageProcess/CMakeLists.txt
index 099b6c9..dc55d60 100644
--- a/hgdriver/ImageProcess/CMakeLists.txt
+++ b/hgdriver/ImageProcess/CMakeLists.txt
@@ -10,8 +10,9 @@ add_library(${PROJECT_NAME} STATIC ${DIR_SRCS})
 
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} 
-                       ${PROJECT_SOURCE_DIR}/../3rdparty/nick
-                       ${PROJECT_SOURCE_DIR}/../hgimgproc
-   					${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+                        ${PROJECT_SOURCE_DIR}/../3rdparty/nick
+                        ${PROJECT_SOURCE_DIR}/../hgimgproc
+   					   ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+                        ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
                                                    )
 set(LIBRARY_OUTPUT_PATH  ${PROJECT_SOURCE_DIR}/../../../build/)
diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt
index 34104c0..f181f24 100644
--- a/hgdriver/hgdev/CMakeLists.txt
+++ b/hgdriver/hgdev/CMakeLists.txt
@@ -44,7 +44,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0)
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} 
                              ${PROJECT_SOURCE_DIR}/../3rdparty/nick
                              ${PROJECT_SOURCE_DIR}/../ImageProcess
-   						               ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+   						    ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+                             ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
                              ${PROJECT_SOURCE_DIR}/../../../sdk/include                         
 
                                                   )
diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt
index 0795ccd..1d79b1a 100644
--- a/hgdriver/wrapper/CMakeLists.txt
+++ b/hgdriver/wrapper/CMakeLists.txt
@@ -106,6 +106,7 @@ endif()
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
                            ${PROJECT_SOURCE_DIR}/../3rdparty/nick
                            ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
+                           ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
                            ${PROJECT_SOURCE_DIR}/../ImageProcess
                            ${PROJECT_SOURCE_DIR}/../hgdev
                            ${PROJECT_SOURCE_DIR}/../../../sdk/include