Commit 52981b15 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: fix gdal, geotiff conflict

parent 0d2b2f16
......@@ -523,7 +523,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
MESSAGE(FATAL_ERROR
"Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
# INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
# Find tiff headers
FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} /usr/include)
......@@ -531,7 +531,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
MESSAGE(FATAL_ERROR
"Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
ENDIF (NOT TIFF_INCLUDE_DIRS)
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
# INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
# Find jpeg headers
FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} /usr/include)
......
......@@ -34,7 +34,7 @@ ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
# )
TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} OTBCommon)
TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml tinyXML)
IF (OTB_USE_LIBLAS)
......
......@@ -15,6 +15,9 @@ CHECK_INCLUDE_FILE("dbmalloc.h" CMAKE_HAVE_DBMALLOC_H)
CHECK_INCLUDE_FILE("malloc.h" CMAKE_HAVE_MALLOC_H)
CHECK_INCLUDE_FILE("dlfcn.h" CMAKE_HAVE_DLFCN_H)
INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Utilities/otbossim/include)
INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/otbossim/include)
......
......@@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${OTB_SOURCE_DIR}/Utilities/otbossim/include
${OTB_BINARY_DIR}/Utilities/otbossim/include
)
INCLUDE_DIRECTORIES(AFTER ${GEOTIFF_INCLUDE_DIRS})
SET(ossimplugins_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR})
......@@ -21,7 +22,7 @@ SET(ossimplugins_SOURCES
)
ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} ${OGR_LIBRARY} otbossim)
TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} ${OGR_LIBRARY} ${GEOTIFF_LIBRARY} otbossim)
#TARGET_LINK_LIBRARIES(otbossimplugins otbossim)
IF(OTB_LIBRARY_PROPERTIES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment