lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整cmake 头文件 调整 tiff导致重定义

This commit is contained in:
13038267101 2022-06-28 17:48:54 +08:00
parent 87ffa8263e
commit 1a57ec7ba8
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/3rdparty/tiff/include/tiff.h vendored
View File

@ -72,8 +72,10 @@ typedef TIFF_UINT16_T uint16;
typedef TIFF_INT32_T int32; typedef TIFF_INT32_T int32;
typedef TIFF_UINT32_T uint32; typedef TIFF_UINT32_T uint32;
#ifdef WIN32
typedef TIFF_INT64_T int64; typedef TIFF_INT64_T int64;
typedef TIFF_UINT64_T uint64; typedef TIFF_UINT64_T uint64;
#endif
/* /*
* Some types as promoted in a variable argument list * Some types as promoted in a variable argument list

7
hgdriver/ImageProcess/CMakeLists.txt
View File

@ -10,8 +10,9 @@ add_library(${PROJECT_NAME} STATIC ${DIR_SRCS})
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/nick
${PROJECT_SOURCE_DIR}/../hgimgproc ${PROJECT_SOURCE_DIR}/../hgimgproc
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
) )
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/)

3
hgdriver/hgdev/CMakeLists.txt
View File

@ -44,7 +44,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0)
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/nick
${PROJECT_SOURCE_DIR}/../ImageProcess ${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 ${PROJECT_SOURCE_DIR}/../../../sdk/include
) )

1
hgdriver/wrapper/CMakeLists.txt
View File

@ -106,6 +106,7 @@ endif()
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/nick
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include
${PROJECT_SOURCE_DIR}/../ImageProcess ${PROJECT_SOURCE_DIR}/../ImageProcess
${PROJECT_SOURCE_DIR}/../hgdev ${PROJECT_SOURCE_DIR}/../hgdev
${PROJECT_SOURCE_DIR}/../../../sdk/include ${PROJECT_SOURCE_DIR}/../../../sdk/include