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

STYLE: simplify ImportGDAL

parent 86c268af
No related branches found
No related tags found
No related merge requests found
...@@ -72,8 +72,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -72,8 +72,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
libgeotiff) libgeotiff)
MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIRS) MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIRS)
IF (NOT GEOTIFF_INCLUDE_DIRS) IF (NOT GEOTIFF_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
"Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
ENDIF (NOT GEOTIFF_INCLUDE_DIRS) ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
# Find tiff headers # Find tiff headers
...@@ -81,8 +80,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -81,8 +80,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
HINTS ${GDAL_INCLUDE_DIR}) HINTS ${GDAL_INCLUDE_DIR})
MARK_AS_ADVANCED(TIFF_INCLUDE_DIRS) MARK_AS_ADVANCED(TIFF_INCLUDE_DIRS)
IF (NOT TIFF_INCLUDE_DIRS) IF (NOT TIFF_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
"Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
ENDIF (NOT TIFF_INCLUDE_DIRS) ENDIF (NOT TIFF_INCLUDE_DIRS)
# Find jpeg headers # Find jpeg headers
...@@ -91,8 +89,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -91,8 +89,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h ${GDAL_INCLUDE_DIR}) FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h ${GDAL_INCLUDE_DIR})
MARK_AS_ADVANCED(JPEG_INCLUDE_DIRS) MARK_AS_ADVANCED(JPEG_INCLUDE_DIRS)
IF (NOT JPEG_INCLUDE_DIRS) IF (NOT JPEG_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
"Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
ENDIF (NOT JPEG_INCLUDE_DIRS) ENDIF (NOT JPEG_INCLUDE_DIRS)
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
...@@ -101,8 +98,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -101,8 +98,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
HINTS ${GDAL_INCLUDE_DIR}) HINTS ${GDAL_INCLUDE_DIR})
MARK_AS_ADVANCED(OGR_INCLUDE_DIRS) MARK_AS_ADVANCED(OGR_INCLUDE_DIRS)
IF (NOT OGR_INCLUDE_DIRS) IF (NOT OGR_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
"Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
ENDIF (NOT OGR_INCLUDE_DIRS) ENDIF (NOT OGR_INCLUDE_DIRS)
INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS})
...@@ -120,8 +116,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -120,8 +116,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
FIND_LIBRARY(TIFF_LIBRARY NAMES tiff libtiff_i) FIND_LIBRARY(TIFF_LIBRARY NAMES tiff libtiff_i)
MARK_AS_ADVANCED(TIFF_LIBRARY) MARK_AS_ADVANCED(TIFF_LIBRARY)
IF (NOT TIFF_LIBRARY) IF (NOT TIFF_LIBRARY)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find tiff library. Please set TIFF_LIBRARY.")
"Cannot find tiff library. Please set TIFF_LIBRARY.")
ENDIF (NOT TIFF_LIBRARY) ENDIF (NOT TIFF_LIBRARY)
ENDIF(GDAL_HAS_TIFF) ENDIF(GDAL_HAS_TIFF)
...@@ -139,8 +134,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -139,8 +134,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
FIND_LIBRARY(GEOTIFF_LIBRARY NAMES geotiff geotiff_i) FIND_LIBRARY(GEOTIFF_LIBRARY NAMES geotiff geotiff_i)
MARK_AS_ADVANCED(GEOTIFF_LIBRARY) MARK_AS_ADVANCED(GEOTIFF_LIBRARY)
IF (NOT GEOTIFF_LIBRARY) IF (NOT GEOTIFF_LIBRARY)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find geotiff library. Please set GEOTIFF_LIBRARY.")
"Cannot find geotiff library. Please set GEOTIFF_LIBRARY.")
ENDIF (NOT GEOTIFF_LIBRARY) ENDIF (NOT GEOTIFF_LIBRARY)
ENDIF(GDAL_HAS_GEOTIFF) ENDIF(GDAL_HAS_GEOTIFF)
...@@ -158,8 +152,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -158,8 +152,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
FIND_LIBRARY(JPEG_LIBRARY NAMES jpeg jpeg_i) FIND_LIBRARY(JPEG_LIBRARY NAMES jpeg jpeg_i)
MARK_AS_ADVANCED(JPEG_LIBRARY) MARK_AS_ADVANCED(JPEG_LIBRARY)
IF (NOT JPEG_LIBRARY) IF (NOT JPEG_LIBRARY)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find jpeg library. Please set JPEG_LIBRARY.")
"Cannot find jpeg library. Please set JPEG_LIBRARY.")
ENDIF (NOT JPEG_LIBRARY) ENDIF (NOT JPEG_LIBRARY)
ENDIF(GDAL_HAS_JPEG) ENDIF(GDAL_HAS_JPEG)
...@@ -178,8 +171,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ...@@ -178,8 +171,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
FIND_LIBRARY(OGR_LIBRARY ogr PATHS) FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
MARK_AS_ADVANCED(OGR_LIBRARY) MARK_AS_ADVANCED(OGR_LIBRARY)
IF (NOT OGR_LIBRARY) IF (NOT OGR_LIBRARY)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR "Cannot find ogr library. Please set OGR_LIBRARY.")
"Cannot find ogr library. Please set OGR_LIBRARY.")
ENDIF (NOT OGR_LIBRARY) ENDIF (NOT OGR_LIBRARY)
ENDIF(GDAL_HAS_OGR) ENDIF(GDAL_HAS_OGR)
......
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