[Plplot-cvs] SF.net SVN: plplot:[12072] trunk

[<and...@us...>]

Revision: 12072
          http://plplot.svn.sourceforge.net/plplot/?rev=12072&view=rev
Author:   andrewross
Date:     2011-11-30 10:36:26 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Ensure tcl / tck / itcl libraries are explicitly linked in as required so the NON_TRANSITIVE=ON case works correctly.

Modified Paths:
--------------
    trunk/bindings/tk/CMakeLists.txt
    trunk/examples/tk/CMakeLists.txt
    trunk/utils/CMakeLists.txt

Modified: trunk/bindings/tk/CMakeLists.txt
===================================================================
--- trunk/bindings/tk/CMakeLists.txt	2011-11-30 02:02:32 UTC (rev 12071)
+++ trunk/bindings/tk/CMakeLists.txt	2011-11-30 10:36:26 UTC (rev 12072)
@@ -103,7 +103,7 @@
   endif(BUILD_SHARED_LIBS)
 
   add_executable(plserver plserver.c)
-  target_link_libraries(plserver plplot${LIB_TAG} plplottcltk${LIB_TAG})
+  target_link_libraries(plserver plplot${LIB_TAG} plplottcltk${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY})
 
   if(USE_RPATH)
     get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)

Modified: trunk/examples/tk/CMakeLists.txt
===================================================================
--- trunk/examples/tk/CMakeLists.txt	2011-11-30 02:02:32 UTC (rev 12071)
+++ trunk/examples/tk/CMakeLists.txt	2011-11-30 10:36:26 UTC (rev 12072)
@@ -172,7 +172,7 @@
       set_source_files_properties(${TK_SRC_FILE}
         PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
     endif(BUILD_SHARED_LIBS AND CORE_BUILD)
-    target_link_libraries(${TK_EXE} plplottcltk${LIB_TAG} tclmatrix${LIB_TAG} plplot${LIB_TAG} ${MATH_LIB})
+    target_link_libraries(${TK_EXE} plplottcltk${LIB_TAG} tclmatrix${LIB_TAG} plplot${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY} ${MATH_LIB})
     set_property(GLOBAL APPEND PROPERTY TARGETS_examples_tk ${TK_EXE})
   endforeach(TK_SRC_FILE ${tk_SRC})
   set_property(GLOBAL APPEND PROPERTY TARGETS_examples_tk tclIndex_examples_tk)

Modified: trunk/utils/CMakeLists.txt
===================================================================
--- trunk/utils/CMakeLists.txt	2011-11-30 02:02:32 UTC (rev 12071)
+++ trunk/utils/CMakeLists.txt	2011-11-30 10:36:26 UTC (rev 12072)
@@ -80,7 +80,7 @@
 
   add_executable(pltcl pltcl.c)
 
-  target_link_libraries(pltcl plplot${LIB_TAG} plplottcltk${LIB_TAG})
+  target_link_libraries(pltcl plplot${LIB_TAG} plplottcltk${LIB_TAG} ${ITCL_LIBRARY} ${TCL_LIBRARY})
 
   if(USE_RPATH)
     set_target_properties(pltcl
@@ -97,4 +97,4 @@
 
 # Build simple executable to check parity bits of all characters read
 # by stdin.
-add_executable(parity_bit_check parity_bit_check.c)
\ No newline at end of file
+add_executable(parity_bit_check parity_bit_check.c)

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