From 0b6ba9cbbbb0ecb395c48e6b9e74fdf656694c85 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 29 Sep 2012 13:14:16 +0200
Subject: [PATCH] COMP: no need for checking {GDAL_INCLUDE_DIR}, the cmake var
GDAL_INCLUDE_DIR is mandatory anyway
---
CMake/ImportGdal.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake
index 00686befb6..10bea83ac5 100644
--- a/CMake/ImportGdal.cmake
+++ b/CMake/ImportGdal.cmake
@@ -64,7 +64,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
MATH(EXPR GDAL_NUM_VERSION "((${GDAL_VERSION_MAJOR})*100+${GDAL_VERSION_MINOR})*100+${GDAL_VERSION_PATCH}")
# Find geotiff headers
- FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include/geotiff /usr/include/libgeotiff)
+ FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include/geotiff /usr/include/libgeotiff)
MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIRS)
IF (NOT GEOTIFF_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR
@@ -72,7 +72,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
# Find tiff headers
- FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+ FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
MARK_AS_ADVANCED(TIFF_INCLUDE_DIRS)
IF (NOT TIFF_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR
@@ -80,7 +80,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
ENDIF (NOT TIFF_INCLUDE_DIRS)
# Find jpeg headers
- FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+ FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
MARK_AS_ADVANCED(JPEG_INCLUDE_DIRS)
IF (NOT JPEG_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR
@@ -89,7 +89,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
# Find ogr headers
- FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
+ FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h ${GDAL_INCLUDE_DIR} ${OSGEO4W_INCLUDE} /usr/include)
MARK_AS_ADVANCED(OGR_INCLUDE_DIRS)
IF (NOT OGR_INCLUDE_DIRS)
MESSAGE(FATAL_ERROR
--
GitLab