|
From: <ai...@us...> - 2013-10-17 20:33:59
|
Revision: 12603
http://sourceforge.net/p/plplot/code/12603
Author: airwin
Date: 2013-10-17 20:33:55 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix libplplottcltk overlinking issues discovered by Orion Poplawski
using rpmlint. The fix is to link to the X11 library alone rather
than X11 library plus extension libraries, and only do that linking
when ENABLE_tk is true (since the pure Tcl library you get with
ENABLE_tk false does not have any undefined symbols in it that need to
be resolved by the X11 library).
Modified Paths:
--------------
trunk/bindings/tcl/CMakeLists.txt
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2013-10-17 19:31:05 UTC (rev 12602)
+++ trunk/bindings/tcl/CMakeLists.txt 2013-10-17 20:33:55 UTC (rev 12603)
@@ -138,7 +138,6 @@
tclmatrix${LIB_TAG}
plplot${LIB_TAG}
${TCL_LIBRARY}
- ${X11_LIBRARIES}
)
set(
libplplottcltk${LIB_TAG}_LINK_FLAGS
@@ -187,6 +186,7 @@
set(plplottcltk${LIB_TAG}_link_libraries
${plplottcltk${LIB_TAG}_link_libraries}
${TK_LIBRARY}
+ ${X11_X11_LIB}
)
set(
libplplottcltk${LIB_TAG}_LINK_FLAGS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|