Replace find_dependency(PostgreSQL) with find_package(PostgreSQL REQU…

…IRED) (#296)
jtv · Mar 8, 2020 · cde0db9 · cde0db9
1 parent 207f348
commit cde0db9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -14,7 +14,10 @@ include(CheckSymbolExists)
 include(CMakeDetermineCompileFeatures)
 include(CheckCXXSourceCompiles)
 include(CMakeFindDependencyMacro)
-find_dependency(PostgreSQL)
+
+if(NOT PostgreSQL_FOUND)
+    find_package(PostgreSQL REQUIRED)
+endif()
 
 check_function_exists("poll" PQXX_HAVE_POLL)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,7 +11,7 @@
 #
 # Generated from template './src/CMakeLists.txt.template'.
 ################################################################################
-if(NOT PostgreSQL_INCLUDE_DIRS)
+if(NOT PostgreSQL_FOUND)
     find_package(PostgreSQL REQUIRED)
 endif()
 

diff --git a/src/CMakeLists.txt.template b/src/CMakeLists.txt.template
@@ -1,4 +1,4 @@
-if(NOT PostgreSQL_INCLUDE_DIRS)
+if(NOT PostgreSQL_FOUND)
     find_package(PostgreSQL REQUIRED)
 endif()
 

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -11,7 +11,7 @@
 #
 # Generated from template './test/unit/CMakeLists.txt.template'.
 # ##############################################################################
-if(NOT PostgreSQL_INCLUDE_DIRS)
+if(NOT PostgreSQL_FOUND)
     find_package(PostgreSQL REQUIRED)
 endif()
 

diff --git a/test/unit/CMakeLists.txt.template b/test/unit/CMakeLists.txt.template
@@ -1,4 +1,4 @@
-if(NOT PostgreSQL_INCLUDE_DIRS)
+if(NOT PostgreSQL_FOUND)
     find_package(PostgreSQL REQUIRED)
 endif()