From 13b769c326f2087c87cdb78ab2fae47ec17e4b18 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 30 May 2006 09:02:38 +0000 Subject: Move cmake duplicate check here: -> FindTagLib: need by kdemultimedia/amarok -> FindPostgreSQL: need by koffice-kexi/amarok -> FindMySQL: need by koffice-kexi/amarok -> FindMusicBrainz: need by amarok/kdemultimedia -> FindUSB: need by kdebase/amarok -> FindBerkeleyDB: need by kbabel/kdevelop -> FindRUBY: need by koffice-kross/amarok I will remove them from kde module after new snapshot (next monday) svn path=/trunk/KDE/kdelibs/; revision=546487 --- modules/FindPostgreSQL.cmake | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/FindPostgreSQL.cmake (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake new file mode 100644 index 00000000..b5de3a4b --- /dev/null +++ b/modules/FindPostgreSQL.cmake @@ -0,0 +1,28 @@ +# - Find PostgreSQL +# Find the PostgreSQL includes and client library +# This module defines +# POSTGRESQL_INCLUDE_DIR, where to find POSTGRESQL.h +# POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. +# POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. + +find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h + /usr/include/pgsql + /usr/local/include/pgsql +) + +find_library(POSTGRESQL_LIBRARIES NAMES pq + PATHS + /usr/lib + /usr/local/lib +) + +if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + set(POSTGRESQL_FOUND TRUE) + message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") +else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + set(POSTGRESQL_FOUND FALSE) + message(STATUS "PostgreSQL not found.") +endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + +mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) + -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindPostgreSQL.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index b5de3a4b..db657240 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -4,6 +4,12 @@ # POSTGRESQL_INCLUDE_DIR, where to find POSTGRESQL.h # POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. # POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. +# +# Copyright (c) 2006, Jaroslaw Staniek, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h /usr/include/pgsql -- cgit v1.2.1 From 4d4782aeaa3d342bcc73554826fd7f01cb7e8b7d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 13 Jun 2007 20:04:34 +0000 Subject: Minor fix svn path=/trunk/KDE/kdelibs/; revision=675178 --- modules/FindPostgreSQL.cmake | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index db657240..d72aae8c 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -11,6 +11,12 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +if (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + # Already in cache, be silent + set(PostgreSQL_FIND_QUIETLY TRUE) +endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + + find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h /usr/include/pgsql /usr/local/include/pgsql @@ -24,11 +30,17 @@ find_library(POSTGRESQL_LIBRARIES NAMES pq if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) set(POSTGRESQL_FOUND TRUE) - message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") -else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - set(POSTGRESQL_FOUND FALSE) - message(STATUS "PostgreSQL not found.") endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) +if(POSTGRESQL_FOUND) + if (NOT PostgreSQL_FIND_QUIETLY) + message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") + endif(NOT PostgreSQL_FIND_QUIETLY) +else(POSTGRESQL_FOUND) + if (PostgreSQL_FIND_REQUIRED) + message(FATAL_ERROR "PostgreSQL not found.") + endif(PostgreSQL_FIND_REQUIRED) +endif(POSTGRESQL_FOUND) + mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -- cgit v1.2.1 From 90ff64277a72c3be7b1dd93827d2ab7f13e5c4f2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Aug 2007 07:07:01 +0000 Subject: Use find_package_handle_standard_args Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=699875 --- modules/FindPostgreSQL.cmake | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index d72aae8c..49acf7be 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -22,25 +22,15 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h /usr/local/include/pgsql ) -find_library(POSTGRESQL_LIBRARIES NAMES pq - PATHS - /usr/lib - /usr/local/lib -) +find_library(POSTGRESQL_LIBRARIES NAMES pq) if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) set(POSTGRESQL_FOUND TRUE) endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) -if(POSTGRESQL_FOUND) - if (NOT PostgreSQL_FIND_QUIETLY) - message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") - endif(NOT PostgreSQL_FIND_QUIETLY) -else(POSTGRESQL_FOUND) - if (PostgreSQL_FIND_REQUIRED) - message(FATAL_ERROR "PostgreSQL not found.") - endif(PostgreSQL_FIND_REQUIRED) -endif(POSTGRESQL_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PostgreSQL DEFAULT_MSG + POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -- cgit v1.2.1 From 186950a4056ca1260bee1431baabb099f9cb7c20 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Aug 2007 07:11:34 +0000 Subject: Use find_package_handle_standard_args Fix previous commit Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=699877 --- modules/FindPostgreSQL.cmake | 4 ---- 1 file changed, 4 deletions(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index 49acf7be..43cb1865 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -24,10 +24,6 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h find_library(POSTGRESQL_LIBRARIES NAMES pq) -if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - set(POSTGRESQL_FOUND TRUE) -endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PostgreSQL DEFAULT_MSG POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindPostgreSQL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index 43cb1865..ab352c7c 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -4,7 +4,7 @@ # POSTGRESQL_INCLUDE_DIR, where to find POSTGRESQL.h # POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. # POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. -# + # Copyright (c) 2006, Jaroslaw Staniek, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From 24817fef7d571052d8014f76f692722f15db4883 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 24 Mar 2008 16:54:13 +0000 Subject: Postgress can be installed in /usr/include/postgresql/ svn path=/trunk/KDE/kdelibs/; revision=789583 --- modules/FindPostgreSQL.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index ab352c7c..b16e9e5e 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -18,8 +18,9 @@ endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h - /usr/include/pgsql - /usr/local/include/pgsql + /usr/include/pgsql/ + /usr/local/include/pgsql/ + /usr/include/postgresql/ ) find_library(POSTGRESQL_LIBRARIES NAMES pq) -- cgit v1.2.1 From 822b4ca32c8a4312817663859007dfe22be9820a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Staniek?= Date: Sat, 31 Oct 2009 22:24:52 +0000 Subject: update email SVN_SILENT svn path=/trunk/KDE/kdelibs/; revision=1043164 --- modules/FindPostgreSQL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPostgreSQL.cmake') diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index b16e9e5e..79556120 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -5,7 +5,7 @@ # POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. # POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. -# Copyright (c) 2006, Jaroslaw Staniek, +# Copyright (c) 2006 Jarosław Staniek # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- cgit v1.2.1