File 0005-Added-FindPostgreSQL.cmake-macros.patch of Package sfcgal

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Added-FindPostgreSQL.cmake-macros.patch of Package sfcgal (Revision 1c3904cbce83fda1e3a3b1ff09a34631)

Currently displaying revision 1c3904cbce83fda1e3a3b1ff09a34631 , Show latest

From fa4fe4eccd4e7f00f69e23eeef7b796417351df4 Mon Sep 17 00:00:00 2001
From: Bruno Friedmann <bruno@ioda-net.ch>
Date: Wed, 22 Jan 2014 14:53:25 +0100
Subject: [PATCH 5/7] Added FindPostgreSQL.cmake macros Fix viewer CMakeList to
 use PostgreSQL macros

---
 cmake/Modules/FindPostgreSQL.cmake | 55 ++++++++++++++++++++++++++++++++++++++
 viewer/CMakeLists.txt              |  4 +--
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 cmake/Modules/FindPostgreSQL.cmake

diff --git a/cmake/Modules/FindPostgreSQL.cmake b/cmake/Modules/FindPostgreSQL.cmake
new file mode 100644
index 0000000..1bfa3be
--- /dev/null
+++ b/cmake/Modules/FindPostgreSQL.cmake
@@ -0,0 +1,55 @@
+# - 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.
+#
+# Copyright (c) 2006, Jaroslaw Staniek, <js@iidea.pl>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# Add the postgresql and mysql include paths here
+
+if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
+
+  set(POSTGRESQL_FOUND TRUE)
+  message(STATUS "Enabled PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}")
+
+else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
+
+  FIND_PATH(POSTGRESQL_INCLUDE_DIR libpq-fe.h
+    /usr/include/postgresql*/
+    /usr/pgsql*/include
+    /usr/local/pgsql/include
+    /usr/local/include
+    /opt/local/include
+    /usr/include/pgsql
+    $ENV{ProgramFiles}/PostgreSQL/*/include
+    $ENV{SystemDrive}/PostgreSQL/*/include
+    )
+
+  FIND_LIBRARY(POSTGRESQL_LIBRARIES NAMES pq libpq
+  PATHS
+    /usr/lib
+    /usr/lib/postgresql
+    /usr/local/lib
+    /usr/pgsql*/lib
+    /usr/lib64
+    /usr/lib64/postgresql
+    /usr/local/lib64
+    /usr/pgsql*/lib64
+    $ENV{ProgramFiles}/PostgreSQL/*/lib/ms
+    $ENV{SystemDrive}/PostgreSQL/*/lib/ms
+  )
+
+  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)
+
+endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt
index da49c00..e2d95bf 100644
--- a/viewer/CMakeLists.txt
+++ b/viewer/CMakeLists.txt
@@ -1,11 +1,11 @@
 find_package( Qt4 COMPONENTS QtGui QtCore REQUIRED )
 find_package( OpenSceneGraph COMPONENTS osgQt osgViewer osgGA osgDB osgUtil REQUIRED )
-
+find_package( PostgreSQL REQUIRED )
 
 include_directories(
 	include
 	# postgresql
-	/usr/include/postgresql
+	${POSTGRESQL_INCLUDE_DIRS}
     ${QT_INCLUDES} 
 	${OPENSCENEGRAPH_INCLUDE_DIRS} 
 )
-- 
1.8.4.5

Places

File 0005-Added-FindPostgreSQL.cmake-macros.patch of Package sfcgal (Revision 1c3904cbce83fda1e3a3b1ff09a34631)

Places