Changeset 1606:402e201356b7

Timestamp:

03/02/10 14:02:20 (5 months ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Message:

Updated CMake Find* modules with better support of *_FIND_QUIETLY specifier. Unscreamified CMake modules.

Location:

cmake/modules

Files:

• FindOracle.cmake (modified) (5 diffs)
• FindSpatialIndex.cmake (modified) (2 diffs)

cmake/modules/FindOracle.cmake

@@ -5 +5 @@
 # On success, the macro sets the following variables:
 # ORACLE_FOUND       = if the library found
+# ORACLE_LIBRARY     = full path to the library
 # ORACLE_LIBRARIES   = full path to the library
 # ORACLE_INCLUDE_DIR = where to find the library headers also defined,
@@ -21 +22 @@
 #
 ###############################################################################
-message(STATUS "Searching for Oracle ${Oracle_FIND_VERSION}+ OCI client library")
 
-if(ORACLE_INCLUDE_DIR)
+if(ORACLE_INCLUDE_DIR AND (ORACLE_LIBRARIES OR ORACLE_LIBRARY))
   # Already in cache, be silent
   set(ORACLE_FIND_QUIETLY TRUE)
+endif()
+
+if(NOT ORACLE_FIND_QUIETLY)
+  message(STATUS "Searching for Oracle ${Oracle_FIND_VERSION}+ OCI client library")
 endif()
 
@@ -40 +44 @@
   ${ORACLE_HOME}/include
   ${ORACLE_HOME}/sdk/include # Oracle SDK
-  ${ORACLE_HOME}/OCI/include # Oracle XE on Windows
-  )
+  ${ORACLE_HOME}/OCI/include # Oracle XE on Windows)
 
 set(ORACLE_OCI_NAMES clntsh libclntsh oci)
@@ -49 +52 @@
 set(ORACLE_LIB_DIR 
   ${ORACLE_HOME}/lib
-  ${ORACLE_HOME}/OCI/lib/MSVC # Oracle XE on Windows
-)
+  ${ORACLE_HOME}/OCI/lib/MSVC # Oracle XE on Windows)
 
 find_library(ORACLE_OCI_LIBRARY  NAMES ${ORACLE_OCI_NAMES} PATHS ${ORACLE_LIB_DIR})
@@ -72 +74 @@
 endif()
 
+set(ORACLE_LIBRARIES ${ORACLE_LIBRARY})
+
 # Handle the QUIETLY and REQUIRED arguments and set ORACLE_FOUND to TRUE
 # if all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ORACLE DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)

cmake/modules/FindSpatialIndex.cmake

@@ -14 +14 @@
 #
 ###############################################################################
-MESSAGE(STATUS "Searching for SpatialIndex ${SpatialIndex_FIND_VERSION}+ library")
 
-IF(SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
+if(SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
   # Already in cache, be silent
-  SET(SPATIALINDEX_FIND_QUIETLY TRUE)
-ENDIF()
+  set(SPATIALINDEX_FIND_QUIETLY TRUE)
+else()
+  message(STATUS "Searching for SpatialIndex ${SpatialIndex_FIND_VERSION}+ library")
+endif()
 
-IF(WIN32)
-  SET(OSGEO4W_IMPORT_LIBRARY spatialindex_i)
-  IF(DEFINED ENV{OSGEO4W_ROOT})
-    SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
-    MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
-  ELSE()
-    SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
-    MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
-  ENDIF()
-ENDIF()
+if(WIN32)
+  set(OSGEO4W_IMPORT_LIBRARY spatialindex_i)
+  if(DEFINED ENV{OSGEO4W_ROOT})
+    set(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
+    if(NOT SPATIALINDEX_FIND_QUIETLY)
+      message(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+    endif()
+  else()
+    set(OSGEO4W_ROOT_DIR c:/OSGeo4W)
+    if(NOT SPATIALINDEX_FIND_QUIETLY)
+      message(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+    endif()
+  endif()
+endif()
 
-FIND_PATH(SPATIALINDEX_INCLUDE_DIR
+find_path(SPATIALINDEX_INCLUDE_DIR
   NAMES SpatialIndex.h RTree.h
   HINTS
   ${OSGEO4W_ROOT_DIR}/include
   PATHS
-  /usr
-  /usr/local
   ${OSGEO4W_ROOT_DIR}/include
   PATH_SUFFIXES spatialindex
   DOC "Path to include directory of SpatialIndex library")
 
-SET(SPATIALINDEX_NAMES ${OSGEO4W_IMPORT_LIBRARY} spatialindex)
-FIND_LIBRARY(SPATIALINDEX_LIBRARY
+set(SPATIALINDEX_NAMES ${OSGEO4W_IMPORT_LIBRARY} spatialindex)
+find_library(SPATIALINDEX_LIBRARY
   NAMES ${SPATIALINDEX_NAMES}
   PATHS ${OSGEO4W_ROOT_DIR}/lib)
 
-IF (SPATIALINDEX_INCLUDE_DIR)
-  SET(SPATIALINDEX_VERSION 0)
+if (SPATIALINDEX_INCLUDE_DIR)
+  set(SPATIALINDEX_VERSION 0)
 
-  SET(SPATIALINDEX_VERSION_H "${SPATIALINDEX_INCLUDE_DIR}/Version.h")
+  set(SPATIALINDEX_VERSION_H "${SPATIALINDEX_INCLUDE_DIR}/Version.h")
   if(NOT EXISTS ${SPATIALINDEX_VERSION_H})
     set(SPATIALINDEX_VERSION_H "${SPATIALINDEX_INCLUDE_DIR}/spatialindex/Version.h")
@@ -58 +61 @@
   file(READ ${SPATIALINDEX_VERSION_H} SPATIALINDEX_VERSION_H_CONTENTS)
 
-  IF (DEFINED SPATIALINDEX_VERSION_H_CONTENTS)
-    STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MAJOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MINOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_REV[ \t]+([0-9]+).*"   "\\1" SIDX_VERSION_REV   "${SPATIALINDEX_VERSION_H_CONTENTS}")
+  if (DEFINED SPATIALINDEX_VERSION_H_CONTENTS)
+    string(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MAJOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
+    string(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MINOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
+    string(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_REV[ \t]+([0-9]+).*"   "\\1" SIDX_VERSION_REV   "${SPATIALINDEX_VERSION_H_CONTENTS}")
 
-    IF(NOT ${SIDX_VERSION_MAJOR} MATCHES "[0-9]+")
-      MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MAJOR!")
-    ENDIF()
-    IF(NOT ${SIDX_VERSION_MINOR} MATCHES "[0-9]+")
-      MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MINOR!")
-    ENDIF()
-    IF(NOT ${SIDX_VERSION_REV} MATCHES "[0-9]+")
-      MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_REV!")
-    ENDIF()
+    if(NOT ${SIDX_VERSION_MAJOR} MATCHES "[0-9]+")
+      message(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MAJOR!")
+    endif()
+    if(NOT ${SIDX_VERSION_MINOR} MATCHES "[0-9]+")
+      message(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MINOR!")
+    endif()
+    if(NOT ${SIDX_VERSION_REV} MATCHES "[0-9]+")
+      message(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_REV!")
+    endif()
 
-    SET(SPATIALINDEX_VERSION "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_REV}"
+    set(SPATIALINDEX_VERSION "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_REV}"
       CACHE INTERNAL "The version string for SpatialIndex library")
 
-    IF (SPATIALINDEX_VERSION VERSION_EQUAL SpatialIndex_FIND_VERSION OR
-        SPATIALINDEX_VERSION VERSION_GREATER SpatialIndex_FIND_VERSION)
-      MESSAGE(STATUS "Found SpatialIndex version: ${SPATIALINDEX_VERSION}")
-    ELSE()
-      MESSAGE(FATAL_ERROR "SpatialIndex version check failed. Version ${SPATIALINDEX_VERSION} was found, at least version ${SpatialIndex_FIND_VERSION} is required")
-    ENDIF()
-  ELSE()
-    MESSAGE(FATAL_ERROR "Failed to open ${SPATIALINDEX_VERSION_H} file")
-  ENDIF()
+    if (SPATIALINDEX_FIND_QUIETLY AND
+        (SPATIALINDEX_VERSION VERSION_EQUAL SpatialIndex_FIND_VERSION OR
+          SPATIALINDEX_VERSION VERSION_GREATER SpatialIndex_FIND_VERSION))
+      message(STATUS "Found SpatialIndex version: ${SPATIALINDEX_VERSION}")
+    else()
+        message(FATAL_ERROR "SpatialIndex version check failed. Version ${SPATIALINDEX_VERSION} was found, at least version ${SpatialIndex_FIND_VERSION} is required")
+    endif()
+  else()
+      message(FATAL_ERROR "Failed to open ${SPATIALINDEX_VERSION_H} file")
+  endif()
 
-ENDIF()
+endif()
 
 # Handle the QUIETLY and REQUIRED arguments and set SPATIALINDEX_FOUND to TRUE
 # if all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SpatialIndex DEFAULT_MSG SPATIALINDEX_LIBRARY SPATIALINDEX_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SpatialIndex DEFAULT_MSG SPATIALINDEX_LIBRARY SPATIALINDEX_INCLUDE_DIR)
 
 # TODO: Do we want to mark these as advanced? --mloskot