fixed unfindable postgres header & cmake variable

Oslandia · Mar 28, 2014 · 9568eef · 9568eef
1 parent 3cd9500
commit 9568eef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/cmake/Modules/FindPostgreSQL.cmake b/cmake/Modules/FindPostgreSQL.cmake
@@ -20,7 +20,9 @@ if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
 else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
 
   FIND_PATH(POSTGRESQL_INCLUDE_DIR libpq-fe.h
+    /usr/include/postgresql/
     /usr/include/postgresql*/
+    /usr/pgsql/include
     /usr/pgsql*/include
     /usr/local/pgsql/include
     /usr/local/include

diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt
@@ -3,11 +3,11 @@ find_package( OpenSceneGraph COMPONENTS osgQt osgViewer osgGA osgDB osgUtil REQU
 find_package( PostgreSQL REQUIRED )
 
 include_directories(
-	include
-	# postgresql
-	${POSTGRESQL_INCLUDE_DIRS}
-    ${QT_INCLUDES} 
-	${OPENSCENEGRAPH_INCLUDE_DIRS} 
+        include
+        # postgresql
+        ${POSTGRESQL_INCLUDE_DIR}
+        ${QT_INCLUDES} 
+        ${OPENSCENEGRAPH_INCLUDE_DIRS} 
 )
 
 file( GLOB_RECURSE VIEWER_SFCGAL_HEADERS ./*.h )
@@ -17,23 +17,23 @@ file( GLOB_RECURSE VIEWER_SFCGAL_SOURCES ./*.cpp )
 QT4_WRAP_CPP(VIEWER_SFCGAL_MOC ${VIEWER_SFCGAL_HEADERS_MOC})
 
 add_executable( viewer-SFCGAL 
-	${VIEWER_SFCGAL_HEADERS}
-	${VIEWER_SFCGAL_SOURCES}
-	${VIEWER_SFCGAL_MOC}
+        ${VIEWER_SFCGAL_HEADERS}
+        ${VIEWER_SFCGAL_SOURCES}
+        ${VIEWER_SFCGAL_MOC}
 )
 
 set(QT_LIBRARIES QtCore QtGui)
 set_target_properties( viewer-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
 target_link_libraries( viewer-SFCGAL
-	SFCGAL
-	${OPENSCENEGRAPH_LIBRARIES}  
-	${QT_LIBRARIES}
-	${CGAL_LIBRARIES}
-	${Boost_LIBRARIES}
-	${MPFR_LIBRARIES}
-	${GMP_LIBRARIES}
-	# Postgresql
-	pq
+        SFCGAL
+        ${OPENSCENEGRAPH_LIBRARIES}  
+        ${QT_LIBRARIES}
+        ${CGAL_LIBRARIES}
+        ${Boost_LIBRARIES}
+        ${MPFR_LIBRARIES}
+        ${GMP_LIBRARIES}
+        # Postgresql
+        pq
 )
 install( TARGETS viewer-SFCGAL DESTINATION bin )