From 9f182e71ab47cc1b8d1644b2ddbd52494bc998d5 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 30 Aug 2012 11:27:07 +0200
Subject: [PATCH] COMP: clarify GDAL status message during configuration
---
CMake/ImportGdal.cmake | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake
index a44fa50ce4..d42cc0b28c 100644
--- a/CMake/ImportGdal.cmake
+++ b/CMake/ImportGdal.cmake
@@ -121,10 +121,10 @@ IF(OTB_USE_EXTERNAL_GDAL)
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${TIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
IF(GDAL_HAS_TIFF)
- MESSAGE(STATUS " Testing if GDAL has tiff -- yes")
+ MESSAGE(STATUS " Testing if GDAL exposes tiff library symbols -- yes")
SET(TIFF_LIBRARY ${GDAL_LIBRARY})
ELSE(GDAL_HAS_TIFF)
- MESSAGE(STATUS " Testing if GDAL has tiff -- no")
+ MESSAGE(STATUS " Testing if GDAL exposes tiff library symbols -- no")
FIND_LIBRARY(TIFF_LIBRARY NAMES tiff libtiff_i PATHS ${OSGEO4W_LIB})
MARK_AS_ADVANCED(TIFF_LIBRARY)
IF (NOT TIFF_LIBRARY)
@@ -140,10 +140,10 @@ IF(OTB_USE_EXTERNAL_GDAL)
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GEOTIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
IF(GDAL_HAS_GEOTIFF)
- MESSAGE(STATUS " Testing if GDAL has geotiff -- yes")
+ MESSAGE(STATUS " Testing if GDAL exposes geotiff library symbols -- yes")
SET(GEOTIFF_LIBRARY ${GDAL_LIBRARY})
ELSE(GDAL_HAS_GEOTIFF)
- MESSAGE(STATUS " Testing if GDAL has geotiff -- no")
+ MESSAGE(STATUS " Testing if GDAL exposes geotiff library symbols -- no")
FIND_LIBRARY(GEOTIFF_LIBRARY NAMES geotiff geotiff_i PATHS ${OSGEO4W_LIB})
MARK_AS_ADVANCED(GEOTIFF_LIBRARY)
IF (NOT GEOTIFF_LIBRARY)
@@ -159,10 +159,10 @@ IF(OTB_USE_EXTERNAL_GDAL)
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIRS};${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
IF(GDAL_HAS_JPEG)
- MESSAGE(STATUS " Testing if GDAL has jpeg -- yes")
+ MESSAGE(STATUS " Testing if GDAL exposes jpeg library symbols -- yes")
SET(JPEG_LIBRARY ${GDAL_LIBRARY})
ELSE(GDAL_HAS_JPEG)
- MESSAGE(STATUS " Testing if GDAL has jpeg -- no")
+ MESSAGE(STATUS " Testing if GDAL exposes jpeg library symbols -- no")
FIND_LIBRARY(JPEG_LIBRARY NAMES jpeg jpeg_i PATHS ${OSGEO4W_LIB})
MARK_AS_ADVANCED(JPEG_LIBRARY)
IF (NOT JPEG_LIBRARY)
@@ -178,10 +178,10 @@ IF(OTB_USE_EXTERNAL_GDAL)
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIR}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
OUTPUT_VARIABLE OUTPUT)
IF(GDAL_HAS_OGR)
- MESSAGE(STATUS " Testing if GDAL has OGR -- yes")
+ MESSAGE(STATUS " Testing if GDAL has OGR -- yes")
SET(OGR_LIBRARY ${GDAL_LIBRARY})
ELSE(GDAL_HAS_OGR)
- MESSAGE(STATUS " Testing if GDAL has OGR -- no")
+ MESSAGE(STATUS " Testing if GDAL has OGR -- no")
MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}")
FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
MARK_AS_ADVANCED(OGR_LIBRARY)
--
GitLab