Changeset 1295:7979f84370b6

Timestamp:

09/27/09 11:06:09 (10 months ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Message:

[cmake] Added requirement of GeoTIFF support if GDAL support was selected.

File:

• CMakeLists.txt (modified) (2 diffs)

CMakeLists.txt

@@ -86 +86 @@
 ENDIF()
 
-# GDAL/OGR support - optional, default=OFF
-SET(WITH_GDAL FALSE CACHE BOOL "Choose if GDAL support should be built")
-
-IF(WITH_GDAL)
-    FIND_PACKAGE(GDAL 1.6.0)
-
-    IF(GDAL_FOUND)
-        INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
-            ADD_DEFINITIONS(-DHAVE_GDAL=1)
-    ENDIF()
-ENDIF()
-
 # GeoTIFF support - optional, default=OFF
 SET(WITH_GEOTIFF FALSE CACHE BOOL "Choose if GeoTIFF support should be built")
@@ -107 +95 @@
         INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIR})
         ADD_DEFINITIONS(-DHAVE_LIBGEOTIFF=1)
+    ENDIF()
+ENDIF()
+
+# GDAL/OGR support - optional, default=OFF
+SET(WITH_GDAL FALSE CACHE BOOL "Choose if GDAL support should be built")
+
+IF(WITH_GDAL)
+    IF (NOT GEOTIFF_FOUND)
+        MESSAGE(FATAL_ERROR "GDAL support requires GeoTIFF library which was not selected")
+    ENDIF()
+
+    FIND_PACKAGE(GDAL 1.6.0)
+
+    IF(GDAL_FOUND)
+        INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
+            ADD_DEFINITIONS(-DHAVE_GDAL=1)
     ENDIF()
 ENDIF()