diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-05 16:31:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-05 16:31:24 (GMT) |
| commit | 3c0a317a1d111fb1012de45c39b81048f5a700d9 (patch) | |
| tree | 2632c1db66abea24ebbb51adae8a4f28fde97638 /Modules | |
| parent | 0ec60a400234624b258307a7944184828c8b6abc (diff) | |
| parent | e992d62b7e15be28c8d560071bcf847f28d9fbb1 (diff) | |
| download | CMake-3c0a317a1d111fb1012de45c39b81048f5a700d9.zip CMake-3c0a317a1d111fb1012de45c39b81048f5a700d9.tar.gz CMake-3c0a317a1d111fb1012de45c39b81048f5a700d9.tar.bz2 | |
Merge branch 'findpostgres-10-and-older' into release-3.16
Merge-request: !3993
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPostgreSQL.cmake | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index cfa4ebc..4fcc79d 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -208,11 +208,22 @@ if (PostgreSQL_INCLUDE_DIR) endif() endforeach() if (_PostgreSQL_VERSION_NUM) - math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000") - math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000") - set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}") - unset(_PostgreSQL_major_version) - unset(_PostgreSQL_minor_version) + # 9.x and older encoding + if (_PostgreSQL_VERSION_NUM LESS 100000) + math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000") + math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000 / 100") + math(EXPR _PostgreSQL_patch_version "${_PostgreSQL_VERSION_NUM} % 100") + set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}.${_PostgreSQL_patch_version}") + unset(_PostgreSQL_major_version) + unset(_PostgreSQL_minor_version) + unset(_PostgreSQL_patch_version) + else () + math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000") + math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000") + set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}") + unset(_PostgreSQL_major_version) + unset(_PostgreSQL_minor_version) + endif () else () foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) if(EXISTS "${_PG_CONFIG_HEADER}") |