Changeset 1605:0656e1ee91ce

Timestamp:

03/02/10 13:40:17 (5 months ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Message:

Improved FindSpatialIndex?.cmake to properly handle user-defined SPATIALINDEX_INCLUDE_DIR

File:

• cmake/modules/FindSpatialIndex.cmake (modified) (2 diffs)

cmake/modules/FindSpatialIndex.cmake

@@ -16 +16 @@
 MESSAGE(STATUS "Searching for SpatialIndex ${SpatialIndex_FIND_VERSION}+ library")
 
-IF(SPATIALINDEX_INCLUDE_DIR)
+IF(SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
   # Already in cache, be silent
   SET(SPATIALINDEX_FIND_QUIETLY TRUE)
@@ -52 +52 @@
 
   SET(SPATIALINDEX_VERSION_H "${SPATIALINDEX_INCLUDE_DIR}/Version.h")
-  FILE(READ ${SPATIALINDEX_VERSION_H} SPATIALINDEX_VERSION_H_CONTENTS)
+  if(NOT EXISTS ${SPATIALINDEX_VERSION_H})
+    set(SPATIALINDEX_VERSION_H "${SPATIALINDEX_INCLUDE_DIR}/spatialindex/Version.h")
+  endif()
+
+  file(READ ${SPATIALINDEX_VERSION_H} SPATIALINDEX_VERSION_H_CONTENTS)
 
   IF (DEFINED SPATIALINDEX_VERSION_H_CONTENTS)