调整cmake 头文件 调整 tiff导致重定义
This commit is contained in:
parent
87ffa8263e
commit
1a57ec7ba8
|
@ -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
|
||||
|
|
|
@ -13,5 +13,6 @@ 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/tiff/include
|
||||
)
|
||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/)
|
||||
|
|
|
@ -45,6 +45,7 @@ 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/tiff/include
|
||||
${PROJECT_SOURCE_DIR}/../../../sdk/include
|
||||
|
||||
)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue