From cbe3304ab58608d48bf8308ec15788637c9ebba9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Mon, 15 Nov 2010 11:04:32 +0100
Subject: [PATCH] BUG: remove gdal/gotiff support for internal liblas since it
is currently broken
---
Utilities/otbliblas/CMakeLists.txt | 34 +++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/Utilities/otbliblas/CMakeLists.txt b/Utilities/otbliblas/CMakeLists.txt
index 31e22b43ef..552ac2f2fa 100755
--- a/Utilities/otbliblas/CMakeLists.txt
+++ b/Utilities/otbliblas/CMakeLists.txt
@@ -45,28 +45,28 @@ SET(liblas_SRCS
)
#include Gdal and GeoTiff support only if version >= 1.6
-COMPARE_VERSION_STRINGS(GDAL_VERSION VERSION_LESS 1.6 result)
-IF(result LESS 0)
-#IF(GDAL_VERSION VERSION_LESS 1.6)
- MESSAGE(STATUS "Disabling GDAL/GeoTIFF support for LibLAS (requires GDAL version >= 1.6)")
-ELSE()
- MESSAGE(STATUS "Enabling GDAL/GeoTIFF support for LibLAS")
- INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS} ${TIFF_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()
+#COMPARE_VERSION_STRINGS(GDAL_VERSION VERSION_LESS 1.6 result)
+#IF(result LESS 0)
+##IF(GDAL_VERSION VERSION_LESS 1.6)
+# MESSAGE(STATUS "Disabling GDAL/GeoTIFF support for LibLAS (requires GDAL version >= 1.6)")
+#ELSE()
+# MESSAGE(STATUS "Enabling GDAL/GeoTIFF support for LibLAS")
+# INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${GEOTIFF_INCLUDE_DIRS} ${TIFF_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()
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(otbliblas ${liblas_SRCS} )
-IF(NOT GDAL_VERSION VERSION_LESS 1.6)
- TARGET_LINK_LIBRARIES(otbliblas ${GDAL_LIBRARY} ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY})
-ENDIF(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})
+#ENDIF(NOT GDAL_VERSION VERSION_LESS 1.6)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbliblas PROPERTIES ${OTB_LIBRARY_PROPERTIES})
--
GitLab