[QGIS Commit] r12317 - in trunk/qgis: . src/plugins/grass src/python

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-03 04:13:55 -0500 (Thu, 03 Dec 2009)
New Revision: 12317

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/src/plugins/grass/CMakeLists.txt
   trunk/qgis/src/python/CMakeLists.txt
Log:
fix link problem on some linuxes (namely RH)

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2009-12-03 09:13:02 UTC (rev 12316)
+++ trunk/qgis/CMakeLists.txt	2009-12-03 09:13:55 UTC (rev 12317)
@@ -110,6 +110,21 @@
 # we don't use cblas
 SET(DONT_LINK_CBLAS TRUE)
 
+IF(NOT WIN32)
+  INCLUDE(CheckFunctionExists)
+  CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)
+  IF(NOT OPENPTY_IN_LIBC)
+    SET(CMAKE_REQUIRED_INCLUDES util.h)
+    SET(CMAKE_REQUIRED_LIBRARIES util)
+    CHECK_FUNCTION_EXISTS(openpty NEED_LIBUTIL)
+    IF(NEED_LIBUTIL)
+      SET(OPENPTY_LIBRARY util)
+    ELSE(NEED_LIBUTIL)
+      MESSAGE (SEND_ERROR "openpty not found!")
+    ENDIF(NEED_LIBUTIL)
+  ENDIF(NOT OPENPTY_IN_LIBC)
+ENDIF(NOT WIN32)
+
 # required
 FIND_PACKAGE(Proj)
 FIND_PACKAGE(Expat)    # GPS importer plugin

Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-12-03 09:13:02 UTC (rev 12316)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-12-03 09:13:55 UTC (rev 12317)
@@ -150,6 +150,7 @@
 TARGET_LINK_LIBRARIES(grassplugin
   qgisgrass
   qgis_gui
+  ${OPENPTY_LIBRARY}
 )
 
 

Modified: trunk/qgis/src/python/CMakeLists.txt
===================================================================
--- trunk/qgis/src/python/CMakeLists.txt	2009-12-03 09:13:02 UTC (rev 12316)
+++ trunk/qgis/src/python/CMakeLists.txt	2009-12-03 09:13:55 UTC (rev 12317)
@@ -27,6 +27,7 @@
 TARGET_LINK_LIBRARIES(qgispython
   qgis_core
   ${PYTHON_LIBRARY}
+  ${OPENPTY_LIBRARY}
 )
 
 IF (APPLE)