Browse Source

More PATH_SUFFIXES for finding Postgresql and also search catalog/pg_type.h

Patch from Jaroslaw Staniek, reviewed by Andrew Maclean

Alex
Alex Neundorf 14 years ago
parent
commit
217d068b6d
1 changed files with 22 additions and 0 deletions
  1. 22 0
      Modules/FindPostgreSQL.cmake

+ 22 - 0
Modules/FindPostgreSQL.cmake

@@ -113,6 +113,21 @@ find_path(PostgreSQL_INCLUDE_DIR
    # Look in other places.
    ${PostgreSQL_ROOT_DIRECTORIES}
   PATH_SUFFIXES
+    pgsql
+    postgresql
+    include
+  # Help the user find it if we cannot.
+  DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
+)
+
+find_path(PostgreSQL_TYPE_INCLUDE_DIR
+  NAMES catalog/pg_type.h
+  PATHS
+   # Look in other places.
+   ${PostgreSQL_ROOT_DIRECTORIES}
+  PATH_SUFFIXES
+    server
+    pgsql
     postgresql
     include
   # Help the user find it if we cannot.
@@ -156,6 +171,13 @@ if(PostgreSQL_FOUND)
     )
   endif(EXISTS "${PostgreSQL_INCLUDE_DIR}")
 
+  if(EXISTS "${PostgreSQL_TYPE_INCLUDE_DIR}")
+    list(APPEND PostgreSQL_INCLUDE_DIRS
+      ${PostgreSQL_TYPE_INCLUDE_DIR}
+    )
+  endif(EXISTS "${PostgreSQL_TYPE_INCLUDE_DIR}")
+
+
   if(EXISTS "${PostgreSQL_LIBRARY_DIR}")
     set(PostgreSQL_LIBRARY_DIRS
       ${PostgreSQL_LIBRARY_DIR}