Skip to content
Snippets Groups Projects
Commit cbe3304a authored by Julien Malik's avatar Julien Malik
Browse files

BUG: remove gdal/gotiff support for internal liblas since it is currently broken

parent d07d7532
No related branches found
No related tags found
No related merge requests found
...@@ -45,28 +45,28 @@ SET(liblas_SRCS ...@@ -45,28 +45,28 @@ SET(liblas_SRCS
) )
#include Gdal and GeoTiff support only if version >= 1.6 #include Gdal and GeoTiff support only if version >= 1.6
COMPARE_VERSION_STRINGS(GDAL_VERSION VERSION_LESS 1.6 result) #COMPARE_VERSION_STRINGS(GDAL_VERSION VERSION_LESS 1.6 result)
IF(result LESS 0) #IF(result LESS 0)
#IF(GDAL_VERSION VERSION_LESS 1.6) ##IF(GDAL_VERSION VERSION_LESS 1.6)
MESSAGE(STATUS "Disabling GDAL/GeoTIFF support for LibLAS (requires GDAL version >= 1.6)") # MESSAGE(STATUS "Disabling GDAL/GeoTIFF support for LibLAS (requires GDAL version >= 1.6)")
ELSE() #ELSE()
MESSAGE(STATUS "Enabling GDAL/GeoTIFF support for LibLAS") # MESSAGE(STATUS "Enabling GDAL/GeoTIFF support for LibLAS")
INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS}) # INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS})
#
LIST(APPEND liblas_SRCS # LIST(APPEND liblas_SRCS
"${liblas_SOURCES_DIR}/gt_citation.cpp" # "${liblas_SOURCES_DIR}/gt_citation.cpp"
"${liblas_SOURCES_DIR}/gt_wkt_srs.cpp") # "${liblas_SOURCES_DIR}/gt_wkt_srs.cpp")
#
ADD_DEFINITIONS(-DHAVE_GDAL -DHAVE_LIBGEOTIFF) # ADD_DEFINITIONS(-DHAVE_GDAL -DHAVE_LIBGEOTIFF)
ENDIF() #ENDIF()
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION) IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(otbliblas ${liblas_SRCS} ) ADD_LIBRARY(otbliblas ${liblas_SRCS} )
IF(NOT GDAL_VERSION VERSION_LESS 1.6) #IF(NOT GDAL_VERSION VERSION_LESS 1.6)
TARGET_LINK_LIBRARIES(otbliblas ${GDAL_LIBRARY} ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY}) # TARGET_LINK_LIBRARIES(otbliblas ${GDAL_LIBRARY} ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY})
ENDIF(NOT GDAL_VERSION VERSION_LESS 1.6) #ENDIF(NOT GDAL_VERSION VERSION_LESS 1.6)
IF(OTB_LIBRARY_PROPERTIES) IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbliblas PROPERTIES ${OTB_LIBRARY_PROPERTIES}) SET_TARGET_PROPERTIES(otbliblas PROPERTIES ${OTB_LIBRARY_PROPERTIES})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment