[Plplot-cvs] SF.net SVN: plplot:[12046] trunk/examples

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

Revision: 12046
          http://plplot.svn.sourceforge.net/plplot/?rev=12046&view=rev
Author:   andrewross
Date:     2011-11-25 09:26:34 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
For f77 / f95 examples with NON_TRANSITIVE=ON then need to explicitly link against 
the C part of the fortran bindings as much of the API is in this library. This 
ensures that the examples build on the latest Fedora / Debian systems with a 
stricter linker.

Modified Paths:
--------------
    trunk/examples/f77/CMakeLists.txt
    trunk/examples/f95/CMakeLists.txt

Modified: trunk/examples/f77/CMakeLists.txt
===================================================================
--- trunk/examples/f77/CMakeLists.txt	2011-11-25 01:43:13 UTC (rev 12045)
+++ trunk/examples/f77/CMakeLists.txt	2011-11-25 09:26:34 UTC (rev 12046)
@@ -146,9 +146,9 @@
   foreach(STRING_INDEX ${f77_STRING_INDICES})
     add_executable(x${STRING_INDEX}f ${f77_directory}/x${STRING_INDEX}f.f)
     if(STATIC_OPTS)
-      target_link_libraries(x${STRING_INDEX}f plplotf77opts${LIB_TAG} plplotf77${LIB_TAG})
+      target_link_libraries(x${STRING_INDEX}f plplotf77opts${LIB_TAG} plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
     else(STATIC_OPTS)
-      target_link_libraries(x${STRING_INDEX}f plplotf77${LIB_TAG})
+      target_link_libraries(x${STRING_INDEX}f plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
     endif(STATIC_OPTS)
     add_dependencies(x${STRING_INDEX}f build_plplot_parameters_h)
     set_property(GLOBAL APPEND PROPERTY TARGETS_examples_f77 x${STRING_INDEX}f)

Modified: trunk/examples/f95/CMakeLists.txt
===================================================================
--- trunk/examples/f95/CMakeLists.txt	2011-11-25 01:43:13 UTC (rev 12045)
+++ trunk/examples/f95/CMakeLists.txt	2011-11-25 09:26:34 UTC (rev 12046)
@@ -125,9 +125,9 @@
       OUTPUT_NAME x${STRING_INDEX}f
       )
     if(STATIC_OPTS)
-      target_link_libraries(x${STRING_INDEX}f95 plplotf95opts${LIB_TAG} plplotf95${LIB_TAG})
+      target_link_libraries(x${STRING_INDEX}f95 plplotf95opts${LIB_TAG} plplotf95${LIB_TAG} plplotf95c${LIB_TAG})
     else(STATIC_OPTS)
-      target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG})
+      target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG} plplotf95c${LIB_TAG})
     endif(STATIC_OPTS)
     set_property(GLOBAL APPEND PROPERTY TARGETS_examples_f95 x${STRING_INDEX}f95)
   endforeach(STRING_INDEX ${f95_STRING_INDICES})

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