From: <ai...@us...> - 2012-10-02 16:08:38
|
Revision: 12232 http://plplot.svn.sourceforge.net/plplot/?rev=12232&view=rev Author: airwin Date: 2012-10-02 16:08:29 +0000 (Tue, 02 Oct 2012) Log Message: ----------- Put the checks for XML::Parser and XML::DOM in a more central location where they are guaranteed to happen (if perl is available). This means these perl modules can be used for, e.g., parsing swig documentation regardless of whether octave and/or docbook have been enabled or not. A further advantage of this new location for the checks is these checks are not independently repeated for the octave and docbook cases. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake trunk/cmake/modules/octave.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/docbook.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -74,10 +74,6 @@ set(EC_PDFTEX ec) endif(EC_ENC_NAME) - if(PERL_FOUND) - check_perl_modules(PERL_XML_PARSER XML::Parser) - check_perl_modules(PERL_XML_DOM XML::DOM) - endif(PERL_FOUND) find_program(DB2X_TEXIXML db2x_texixml) if(NOT DB2X_TEXIXML) message(STATUS "WARNING: db2x_texixml not found") Modified: trunk/cmake/modules/octave.cmake =================================================================== --- trunk/cmake/modules/octave.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/octave.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -208,8 +208,6 @@ endif(ENABLE_octave) if(ENABLE_octave) - check_perl_modules(PERL_XML_PARSER XML::Parser) - check_perl_modules(PERL_XML_DOM XML::DOM) #MATWRAP is the path+filename of the matwrap script. set(MATWRAP "${CMAKE_CURRENT_SOURCE_DIR}/bindings/octave/matwrap/matwrap") message(STATUS "MATWRAP = ${MATWRAP}") Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/plplot.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -380,12 +380,15 @@ endif(SWIG_FOUND) # Find Perl. Required in several places in the build system (e.g., -# tcl and docbook). +# tcl and docbook). Also check for XML::Parser and XML::DOM which +# are also used several places in the build system. find_package(Perl) if(PERL_FOUND) include(CheckPerlModules) + check_perl_modules(PERL_XML_PARSER XML::Parser) + check_perl_modules(PERL_XML_DOM XML::DOM) endif(PERL_FOUND) - + # ======================================================================= # pkg-config support as well as macros to put link flags in standard # *.pc (pkg-config) form as well as standard fullpath form used by cmake. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |