Merge branch 'jtv:master' into master

jtv · Jul 20, 2024 · 8de7706 · 8de7706
2 parents bd3d896 + 86f7d62
commit 8de7706
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -2,7 +2,7 @@
  - Fix CMake documentation install. (#848)
  - Bump gcc/clang/postgres minimum version requirements.
  - Another fix to the readthedocs documentation build. (#845)
- - Remove obsolete CMake workaround kludge. (#851, #866)
+ - Remove obsolete CMake workaround kludges. (#851, #866, #867)
  - Remove obscure deprecated `stream_to` constructor that never worked. (#853)
  - Support reading a field as an SQL array using `as_sql_array()`. (#841)
  - Make row iterator a _proper_ `random_access_iterator`. (#846)

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -38,8 +38,6 @@ check_function_exists("poll" PQXX_HAVE_POLL)
 
 set(CMAKE_REQUIRED_LIBRARIES pq)
 
-cmake_policy(SET CMP0057 NEW)
-
 # check_cxx_source_compiles requires CMAKE_REQUIRED_DEFINITIONS to specify
 # compiling arguments. Workaround: Push CMAKE_REQUIRED_DEFINITIONS
 if(CMAKE_REQUIRED_DEFINITIONS)