diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:55:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:55:06 (GMT) |
| commit | 4c40cf681b8a5aa821e051c83af151209b60740e (patch) | |
| tree | e7713a418ab486c755965450fe99d44aaca0f494 | |
| parent | b4ea74c5ca58d4327823c78dce1b6906fda72c7e (diff) | |
| parent | 8dac3af03c0685d61ff10e1d1adc4bbf6d096966 (diff) | |
| download | CMake-4c40cf681b8a5aa821e051c83af151209b60740e.zip CMake-4c40cf681b8a5aa821e051c83af151209b60740e.tar.gz CMake-4c40cf681b8a5aa821e051c83af151209b60740e.tar.bz2 | |
Merge topic 'postgresql-96'
8dac3af0 FindPostgreSQL: Search for version 9.6
84039a6a FindPostgreSQL: Correct comment about known postgres versions
| -rw-r--r-- | Modules/FindPostgreSQL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index 32a3f0a..84fa541 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -37,7 +37,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.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" +# "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") @@ -81,7 +81,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} - "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + "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 |