summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-01-09 09:44:56 -0500
committerBrad King <brad.king@kitware.com>2018-01-09 09:44:56 -0500
commit9559eb7aa7bcb267f49bb304075ef952660753ee (patch)
tree4cdc3dc186226d2eed9356726a0f8dd39706c19a
parentc69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b (diff)
parent9417a6d322fbb94dddd3217abd02358dab21689c (diff)
downloadcmake-9559eb7aa7bcb267f49bb304075ef952660753ee.tar.gz
Merge branch 'FindPostgres_support_for_v10' into release-3.10
Merge-request: !1635
-rw-r--r--Modules/FindPostgreSQL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 9e2194ce4a..f745876ecb 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -27,7 +27,7 @@
# 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:
-# "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
+# "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")
@@ -71,7 +71,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
- "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ "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