This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 0bf53483295a4b7de358e8b85ad44866d89633c5 (commit)
via 8538685c85f75d1904800999a50e12d3abb7484e (commit)
via 368bcba28a9cd4a9f75d6671cd391b8ceef8e973 (commit)
via 273257222ee6207dcb9ad290a08db5d6b7cc9db8 (commit)
from 389f795d2e68d287fcbba0d5e0e4678f3d90fe4c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bf53483295a4b7de358e8b85ad44866d89633c5
commit 0bf53483295a4b7de358e8b85ad44866d89633c5
Merge: 8538685 2732572
Author: Brad King
AuthorDate: Tue May 21 13:46:36 2019 +
Commit: Kitware Robot
CommitDate: Tue May 21 09:46:45 2019 -0400
Merge topic 'string-param'
273257222e Source: change parameters to std::string
Acked-by: Kitware Robot
Merge-request: !3340
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8538685c85f75d1904800999a50e12d3abb7484e
commit 8538685c85f75d1904800999a50e12d3abb7484e
Merge: 389f795 368bcba
Author: Brad King
AuthorDate: Tue May 21 13:44:09 2019 +
Commit: Kitware Robot
CommitDate: Tue May 21 09:44:19 2019 -0400
Merge topic 'FindPostgreSQL-config-support'
368bcba28a FindPostgreSQL: Find debug lib, imported configs
Acked-by: Kitware Robot
Merge-request: !3298
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=368bcba28a9cd4a9f75d6671cd391b8ceef8e973
commit 368bcba28a9cd4a9f75d6671cd391b8ceef8e973
Author: Andrei Lebedev
AuthorDate: Thu May 9 20:17:28 2019 +0300
Commit: Brad King
CommitDate: Mon May 20 11:29:04 2019 -0400
FindPostgreSQL: Find debug lib, imported configs
* Add find_library calls for debug and release
* Set imported configs for corresponding libraries in imported target
* Set debug/optimized in PostgreSQL_LIBRARIES
Signed-off-by: Andrei Lebedev
diff --git a/Help/release/dev/FindPostgreSQL-config-support.rst
b/Help/release/dev/FindPostgreSQL-config-support.rst
new file mode 100644
index 000..f24dc68
--- /dev/null
+++ b/Help/release/dev/FindPostgreSQL-config-support.rst
@@ -0,0 +1,5 @@
+FindPostgreSQL-config-support
+-
+
+* The :module:`FindPostgreSQL` module learned to find debug and release
+ variants separately.
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 4b5e60e..433eae7 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -155,16 +155,30 @@ if ( WIN32 )
set (PostgreSQL_LIBRARY_TO_FIND
${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
endif()
-find_library(PostgreSQL_LIBRARY
- NAMES ${PostgreSQL_LIBRARY_TO_FIND}
- PATHS
- ${PostgreSQL_ROOT_DIRECTORIES}
- PATH_SUFFIXES
- lib
- ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
- # Help the user find it if we cannot.
- DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}"
-)
+function(__postgresql_find_library _name)
+ find_library(${_name}
+ NAMES ${ARGN}
+ PATHS
+ ${PostgreSQL_ROOT_DIRECTORIES}
+ PATH_SUFFIXES
+ lib
+ ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
+ # Help the user find it if we cannot.
+ DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}"
+ )
+endfunction()
+
+# For compatibility with versions prior to this multi-config search, honor
+# any PostgreSQL_LIBRARY that is already specified and skip the search.
+if(PostgreSQL_LIBRARY)
+ set(PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARY}")
+else()
+ __postgresql_find_library(PostgreSQL_LIBRARY_RELEASE
${PostgreSQL_LIBRARY_TO_FIND})
+ __postgresql_find_library(PostgreSQL_LIBRARY_DEBUG
${PostgreSQL_LIBRARY_TO_FIND}d)
+ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+ select_library_configurations(PostgreSQL)
+ mark_as_advanced(PostgreSQL_LIBRARY_RELEASE PostgreSQL_LIBRARY_DEBUG)
+endif()
get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
if (PostgreSQL_INCLUDE_DIR)
@@ -213,17 +227,36 @@ find_package_handle_standard_args(PostgreSQL
VERSION_VAR PostgreSQL_VERSION_STRING)
set(PostgreSQL_FOUND ${POSTGRESQL_FOUND})
+function(__postgresql_import_library _target _var _config)
+ if(_config)
+set(_config_suffix "_${_config}")
+ else()
+set(_config_suffix "")
+ endif()
+
+ set(_lib "${${_var}${_config_suffix}}")
+ if(EXISTS "${_lib}")
+if(_config)
+ set_property(TARGET ${_target} APPEND PROPERTY
+IMPORTED_CONFIGURATIONS ${_config})
+endif()
+set_target_properties(${_target} PROPERTIES
+ IMPORTED_LOCATION${_config_suffix} "${_lib}")
+ endif()
+endfunction()
+
# Now try to get the include and library path.
if(
