summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-31 13:32:32 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-10-31 13:32:38 (GMT)
commit5dc4bd1c90448eb4ce4f20a63ce706ce8114f29d (patch)
treec48d1aea0732d11e972cc41fdd239941898d6d51 /Modules
parent69aaf0d07645b9805d86db78d000835757f6a99c (diff)
parenteea851bc2e0607262cd3b3ec58fff4522728e1a4 (diff)
downloadCMake-5dc4bd1c90448eb4ce4f20a63ce706ce8114f29d.zip
CMake-5dc4bd1c90448eb4ce4f20a63ce706ce8114f29d.tar.gz
CMake-5dc4bd1c90448eb4ce4f20a63ce706ce8114f29d.tar.bz2
Merge topic 'FindPostgreSQL-11'
eea851bc2e FindPostgreSQL: Search for version 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mateusz Łoskot <mateusz@loskot.net> Merge-request: !2547
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindPostgreSQL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index cb6265a..77fa4ed 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -28,7 +28,7 @@ This module defines
# In Windows the default installation of PostgreSQL uses that as part of the path.
# E.g C:\Program Files\PostgreSQL\8.4.
# Currently, the following version numbers are known to this module:
-# "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
+# "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
#
# To use this variable just do something like this:
# set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4")
@@ -72,7 +72,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
- "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
# Define additional search paths for root directories.
set( PostgreSQL_ROOT_DIRECTORIES