diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2014-08-31 19:52:04 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-02 10:35:37 -0400 |
| commit | 741f29cc00beb52ebe45bde8245dae557a72cc10 (patch) | |
| tree | 4e4977ded87b41007a11dfb1f9c15c34033f5f01 /Modules/FindPostgreSQL.cmake | |
| parent | 5d7ce7a488912cc8f76eb9fe254070fc9d214fd7 (diff) | |
| download | cmake-741f29cc00beb52ebe45bde8245dae557a72cc10.tar.gz | |
FindPostgreSQL: Fix for pg_config in multilib configurations.
Some platforms, Fedora 20 and RHEL 7 in particular, will have multiple
pg_config_${arch}.h files all included by the top level pg_config.h.
This checks all of the available pg_config*.h headers for version
information.
Diffstat (limited to 'Modules/FindPostgreSQL.cmake')
| -rw-r--r-- | Modules/FindPostgreSQL.cmake | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index f13dea87df..97666c886c 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -145,12 +145,22 @@ 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 ]+\".*\"") - - string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1" - PostgreSQL_VERSION_STRING "${pgsql_version_str}") +if (PostgreSQL_INCLUDE_DIR) + # Some platforms include multiple pg_config.hs for multi-lib configurations + # This is a temporary workaround. A better solution would be to compile + # a dummy c file and extract the value of the symbol. + file(GLOB _PG_CONFIG_HEADERS "${PostgreSQL_INCLUDE_DIR}/pg_config*.h") + foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) + if(EXISTS "${_PG_CONFIG_HEADER}") + file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str + REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"") + if(pgsql_version_str) + string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" + "\\1" PostgreSQL_VERSION_STRING "${pgsql_version_str}") + break() + endif() + endif() + endforeach() unset(pgsql_version_str) endif() |