[Tora-cvs] SF.net SVN: tora:[2981] trunk/tora

[<su...@us...>]

Revision: 2981
          http://tora.svn.sourceforge.net/tora/?rev=2981&view=rev
Author:   subik
Date:     2008-09-08 12:48:12 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
make it compilable with pgsql libs on windows

Modified Paths:
--------------
    trunk/tora/CMakeLists.txt
    trunk/tora/cmake/modules/FindPostgreSQL.cmake

Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt	2008-09-08 00:57:11 UTC (rev 2980)
+++ trunk/tora/CMakeLists.txt	2008-09-08 12:48:12 UTC (rev 2981)
@@ -208,6 +208,8 @@
     MESSAGE(WARNING " No PostgreSQL environment has been found.")
     MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path")
     MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually")
+	#MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}")
+	#MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}")
     MESSAGE(" ")
 ENDIF (POSTGRESQL_FOUND)
 

Modified: trunk/tora/cmake/modules/FindPostgreSQL.cmake
===================================================================
--- trunk/tora/cmake/modules/FindPostgreSQL.cmake	2008-09-08 00:57:11 UTC (rev 2980)
+++ trunk/tora/cmake/modules/FindPostgreSQL.cmake	2008-09-08 12:48:12 UTC (rev 2981)
@@ -19,13 +19,13 @@
 
 
 find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h
-   ${DPOSTGRESQL_PATH_INCLUDES}/
+   ${POSTGRESQL_PATH_INCLUDES}/
    /usr/include/pgsql/
    /usr/local/include/pgsql/
    /usr/include/postgresql/
 )
 
-find_library(POSTGRESQL_LIBRARIES NAMES pq
+find_library(POSTGRESQL_LIBRARIES NAMES pq libpq
              PATH ${POSTGRESQL_PATH_LIB})
 
 include(FindPackageHandleStandardArgs)
@@ -34,3 +34,6 @@
 
 mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES)
 
+#MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}")
+#MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}")
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.