COMP: build liblas with gdal only when gdal version is 1.6 or greater

Utilities/otbliblas/CMakeLists.txt

@@ -4,16 +4,54 @@ SET(liblas_VERSION_MAJOR "1")
 SET(liblas_VERSION_MINOR "2")
 SET(liblas_VERSION_PATCH "1")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 SET(liblas_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
-FILE(GLOB_RECURSE liblas_SRCS "${liblas_SOURCES_DIR}/*.cpp" )
-
+SET(liblas_SRCS
+    "${liblas_SOURCES_DIR}/las_c_api.cpp"
+    "${liblas_SOURCES_DIR}/lascolor.cpp"
+    "${liblas_SOURCES_DIR}/laserror.cpp"
+    "${liblas_SOURCES_DIR}/lasfile.cpp"
+    "${liblas_SOURCES_DIR}/lasheader.cpp"
+    "${liblas_SOURCES_DIR}/laspoint.cpp"
+    "${liblas_SOURCES_DIR}/lasreader.cpp"
+    "${liblas_SOURCES_DIR}/lasspatialreference.cpp"
+    "${liblas_SOURCES_DIR}/lasvariablerecord.cpp"
+    "${liblas_SOURCES_DIR}/laswriter.cpp"
+    "${liblas_SOURCES_DIR}/tifvsi.cpp"
+    "${liblas_SOURCES_DIR}/detail/file.cpp"
+    "${liblas_SOURCES_DIR}/detail/reader11.cpp"
+    "${liblas_SOURCES_DIR}/detail/reader.cpp"
+    "${liblas_SOURCES_DIR}/detail/writer11.cpp"
+    "${liblas_SOURCES_DIR}/detail/writer.cpp"
+    "${liblas_SOURCES_DIR}/detail/reader10.cpp"
+    "${liblas_SOURCES_DIR}/detail/reader12.cpp"
+    "${liblas_SOURCES_DIR}/detail/writer10.cpp"
+    "${liblas_SOURCES_DIR}/detail/writer12.cpp")
 
+#include Gdal and GeoTiff support only if version >= 1.6
+IF(GDAL_VERSION VERSION_LESS 1.6)
+  MESSAGE(STATUS "Disabling GDAL/GeoTIFF support for LibLAS (requires GDAL version >= 1.6)")
+ELSE(GDAL_VERSION VERSION_LESS 1.6)
+  MESSAGE(STATUS "Enabling GDAL/GeoTIFF support for LibLAS")
+  INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS})
+  
+  LIST(APPEND liblas_SRCS
+       "${liblas_SOURCES_DIR}/gt_citation.cpp"
+       "${liblas_SOURCES_DIR}/gt_wkt_srs.cpp")
+  
+  ADD_DEFINITIONS(-DHAVE_GDAL -DHAVE_LIBGEOTIFF)
+ENDIF(GDAL_VERSION VERSION_LESS 1.6)
+  
 IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
 
+
 ADD_LIBRARY(otbliblas ${liblas_SRCS} )
 TARGET_LINK_LIBRARIES(otbliblas ${GDAL_LIBRARY} ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY})
+IF(GDAL_VERSION VERSION_LESS 1.6)
+  TARGET_LINK_LIBRARIES(otbliblas ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY})
+ENDIF(GDAL_VERSION VERSION_LESS 1.6)
+
 IF(OTB_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(otbliblas PROPERTIES ${OTB_LIBRARY_PROPERTIES})
 ENDIF(OTB_LIBRARY_PROPERTIES)