|
From: <ai...@us...> - 2010-01-14 19:44:19
|
Revision: 10753
http://plplot.svn.sourceforge.net/plplot/?rev=10753&view=rev
Author: airwin
Date: 2010-01-14 19:43:31 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Correct qhull location issues for pkg-config. Warning: I think this should
work, but I am not in a position to test it for a week or so.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-01-14 05:26:21 UTC (rev 10752)
+++ trunk/src/CMakeLists.txt 2010-01-14 19:43:31 UTC (rev 10753)
@@ -213,11 +213,14 @@
)
set(
libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_LIBRARY_DIRS} -lqhull"
)
+ # Needed by plgridd.c.
include_directories(
${QHULL_INCLUDE_DIRS}
)
+ # Needed by traditional pkg-config approach for installed examples.
+ set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_LIBRARY_DIRS})
endif(HAVE_QHULL)
if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|