From: <ai...@us...> - 2013-12-16 23:51:46
|
Revision: 12869 http://sourceforge.net/p/plplot/code/12869 Author: airwin Date: 2013-12-16 23:51:43 +0000 (Mon, 16 Dec 2013) Log Message: ----------- Tweak commentary concerning placement of certain includes which use the filter_rpath function which depends on languages being defined. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2013-12-16 00:14:36 UTC (rev 12868) +++ trunk/cmake/modules/plplot.cmake 2013-12-16 23:51:43 UTC (rev 12869) @@ -464,6 +464,7 @@ include(java) include(python) include(octave) +# tcl-related must come after c++ and fortran because of use of filter_rpath include(tcl-related) include(pdl) include(ada) @@ -509,6 +510,7 @@ # ======================================================================= # additional library support # ======================================================================= +# shapelib must come after c++ and fortran because of use of filter_rpath # Support for shapelib library for reading shapefile map data include(shapelib) include(freetype) @@ -520,7 +522,8 @@ message(FATAL_ERROR "Cannot find required math library") endif(NOT MATH_LIB) endif(NOT WIN32_OR_CYGWIN) -# Must come after MATH_LIB is defined (or not). +# csiro must come after MATH_LIB is defined (or not). +# csiro must come after c++ and fortran because of use of filter_rpath include(csiro) @@ -532,6 +535,7 @@ # ======================================================================= # Device drivers # ======================================================================= +# drivers must come after c++ and fortran because of use of filter_rpath include(drivers) # ======================================================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |