From da1bdaf16a60d3822f15feb1b1a9d624ae357705 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Thu, 28 Jul 2011 23:19:52 +0200
Subject: [PATCH] Use FPHSA(), remove unnecessary stuff and don't recommend
 link_directories()

-don't recommend using link_directories()
-don't do the extra if(EXISTS) checks, since the code is already inside a if(PostgreSQL_FOUND)

Alex
---
 Modules/FindPostgreSQL.cmake | 46 +++++++-----------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 3595b4d3e..3f730017e 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -7,7 +7,6 @@
 # ...
 # if( PostgreSQL_FOUND )
 #   include_directories(${PostgreSQL_INCLUDE_DIRS})
-#   link_directories(${PostgreSQL_LIBRARY_DIRS})
 # endif( PostgreSQL_FOUND )
 # ...
 # Remember to include ${PostgreSQL_LIBRARIES} in the target_link_libraries() statement.
@@ -153,49 +152,20 @@ find_library( PostgreSQL_LIBRARY
 get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
 
 # Did we find anything?
-set( PostgreSQL_FOUND 0 )
-if ( EXISTS "${PostgreSQL_INCLUDE_DIR}" AND EXISTS "${PostgreSQL_LIBRARY_DIR}" )
-  set( PostgreSQL_FOUND 1 )
-else ( EXISTS "${PostgreSQL_INCLUDE_DIR}" AND EXISTS "${PostgreSQL_LIBRARY_DIR}" )
-  if ( POSTGRES_REQUIRED )
-    message( FATAL_ERROR "PostgreSQL is required. ${PostgreSQL_ROOT_DIR_MESSAGE}" )
-  endif ( POSTGRES_REQUIRED )
-endif (EXISTS "${PostgreSQL_INCLUDE_DIR}" AND EXISTS "${PostgreSQL_LIBRARY_DIR}" )
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PostgreSQL DEFAULT_MSG
+                                  PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY)
+
+set( PostgreSQL_FOUND  ${POSTGRESQL_FOUND})
 
 # Now try to get the include and library path.
 if(PostgreSQL_FOUND)
 
-  if(EXISTS "${PostgreSQL_INCLUDE_DIR}")
-    set(PostgreSQL_INCLUDE_DIRS
-      ${PostgreSQL_INCLUDE_DIR}
-    )
-  endif(EXISTS "${PostgreSQL_INCLUDE_DIR}")
-
-  if(EXISTS "${PostgreSQL_TYPE_INCLUDE_DIR}")
-    list(APPEND PostgreSQL_INCLUDE_DIRS
-      ${PostgreSQL_TYPE_INCLUDE_DIR}
-    )
-  endif(EXISTS "${PostgreSQL_TYPE_INCLUDE_DIR}")
-
-
-  if(EXISTS "${PostgreSQL_LIBRARY_DIR}")
-    set(PostgreSQL_LIBRARY_DIRS
-      ${PostgreSQL_LIBRARY_DIR}
-    )
-    set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
-  endif(EXISTS "${PostgreSQL_LIBRARY_DIR}")
+  set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
+  set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
+  set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
 
   #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}")
   #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}")
   #message("Final PostgreSQL libraries:   ${PostgreSQL_LIBRARIES}")
 endif(PostgreSQL_FOUND)
-
-if(NOT PostgreSQL_FOUND)
-  if(NOT PostgreSQL_FIND_QUIETLY)
-    message(STATUS "PostgreSQL was not found. ${PostgreSQL_DIR_MESSAGE}")
-  else(NOT PostgreSQL_FIND_QUIETLY)
-    if(PostgreSQL_FIND_REQUIRED)
-      message(FATAL_ERROR "PostgreSQL was not found. ${PostgreSQL_DIR_MESSAGE}")
-    endif(PostgreSQL_FIND_REQUIRED)
-  endif(NOT PostgreSQL_FIND_QUIETLY)
-endif(NOT PostgreSQL_FOUND)