diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-07 14:28:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-07 14:29:20 (GMT) |
| commit | 4011b1be41e97de3f1c1cee741f0627838913974 (patch) | |
| tree | c71b0d5ceb916a0469d84902deaf7f0823edbb1f /Modules | |
| parent | 2a5e5b25ba4d6eb68dbee29381774562c98e228f (diff) | |
| parent | aeae4182cb90cbf65b1c27cc877f62d2c7690aaf (diff) | |
| download | CMake-4011b1be41e97de3f1c1cee741f0627838913974.zip CMake-4011b1be41e97de3f1c1cee741f0627838913974.tar.gz CMake-4011b1be41e97de3f1c1cee741f0627838913974.tar.bz2 | |
Merge branch 'backport-findpostgres-10-and-older' into release-3.15
Merge-request: !4007
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 dfece22..dfdd211 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -205,11 +205,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}") |