Attachment 589245 Details for Bug 828467 – A fix for FindPostgreSQL.cmake

[patch] A fix for FindPostgreSQL.cmake

cmake-postgresql.patch (text/plain), 1.41 KB, created by Petr Machata on 2012-06-04 18:50:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Machata

Created: 2012-06-04 18:50:52 UTC

Size: 1.41 KB

patch

obsolete

>diff -up cmake-2.8.8/Modules/FindPostgreSQL.cmake\~ cmake-2.8.8/Modules/FindPostgreSQL.cmake
>--- cmake-2.8.8/Modules/FindPostgreSQL.cmake~	2012-04-18 20:10:54.000000000 +0200
>+++ cmake-2.8.8/Modules/FindPostgreSQL.cmake	2012-06-04 20:12:56.753103107 +0200
>@@ -142,8 +142,25 @@ find_library( PostgreSQL_LIBRARY
> get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
> 
> if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
>-  file(STRINGS "${PostgreSQL_INCLUDE_DIR}/pg_config.h" pgsql_version_str
>-       REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
>+
>+  # In recent PostgreSQL packages, pg_config.h is a dispatcher to
>+  # per-arch include files pg_config_<arch>.h.  Look if we have the
>+  # latter before we look for the former.
>+
>+  message(STATUS "Extracting PostgreSQL version string")
>+  foreach(FN "${PostgreSQL_INCLUDE_DIR}/pg_config_${CMAKE_SYSTEM_PROCESSOR}.h"
>+             "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
>+    message(STATUS "  checking ${FN}")
>+    if (EXISTS "${FN}")
>+      file(STRINGS "${FN}" pgsql_version_str
>+           REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
>+      if (NOT "${pgsql_version_str}" STREQUAL "")
>+        break()
>+      endif()
>+    else()
>+      message(STATUS "    (not found)")
>+    endif()
>+  endforeach(FN)
> 
>   string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1"
>          PostgreSQL_VERSION_STRING "${pgsql_version_str}")

Actions: View | Diff

Attachments on bug 828467: 589245 | 596289