Revision: 11733
http://plplot.svn.sourceforge.net/plplot/?rev=11733&view=rev
Author: airwin
Date: 2011-04-30 04:18:48 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
Enable test of Perl/PDL examples by default, but only allow that test if
you have version 0.55 (or later) of PDL::Graphics::PLplot.
Modified Paths:
--------------
trunk/cmake/modules/pdl.cmake
Modified: trunk/cmake/modules/pdl.cmake
===================================================================
--- trunk/cmake/modules/pdl.cmake 2011-04-30 04:16:29 UTC (rev 11732)
+++ trunk/cmake/modules/pdl.cmake 2011-04-30 04:18:48 UTC (rev 11733)
@@ -23,7 +23,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_pdl "Enable Perl/PDL examples in tests" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_pdl "Enable Perl/PDL examples in tests" OFF)
+ option(ENABLE_pdl "Enable Perl/PDL examples in tests" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_pdl)
@@ -37,9 +37,8 @@
if(ENABLE_pdl)
option(SKIP_PDL_CHECK "SKIP all PDL checks because libplplotd not yet available at cmake time" OFF)
if(SKIP_PDL_CHECK)
- message(STATUS "Assume PDL exists and has version >= 2.4.1")
- message(STATUS "Assume PDL-Graphics-PLplot exists and has version >= 0.47")
- set(HAVE_PDL_GRAPHICS_PLPLOT_40 ON CACHE BOOL "PDL-Graphics-PLplot version is 0.47 or higher" FORCE)
+ message(STATUS "Assume PDL exists and has version >= 2.4.7")
+ message(STATUS "Assume PDL-Graphics-PLplot exists and has version >= 0.55")
else(SKIP_PDL_CHECK)
# N.B. Some of the checks below only work if the correct version
# of libplplotd.so (currently libplplotd.so.10) is accessible
@@ -60,11 +59,11 @@
OUTPUT_VARIABLE PDL_VERSION
)
message(STATUS "PDL_VERSION = ${PDL_VERSION}")
- transform_version(NUMERICAL_PDL_MINIMUM_VERSION "2.4.1")
+ transform_version(NUMERICAL_PDL_MINIMUM_VERSION "2.4.7")
transform_version(NUMERICAL_PDL_VERSION "${PDL_VERSION}")
if(NUMERICAL_PDL_VERSION LESS "${NUMERICAL_PDL_MINIMUM_VERSION}")
message(STATUS "WARNING: "
- "PDL version < 2.4.1. Disabling Perl/PDL examples in tests")
+ "PDL version < 2.4.7. Disabling Perl/PDL examples in tests")
set(ENABLE_pdl OFF CACHE BOOL "Enable Perl/PDL examples in tests" FORCE)
else(NUMERICAL_PDL_VERSION LESS "${NUMERICAL_PDL_MINIMUM_VERSION}")
execute_process(
@@ -76,7 +75,7 @@
)
if(NOT PDL_GRAPHICS_PLPLOT_RETURN_CODE)
message(STATUS
- "PDL version >= 2.4.1 and PDL::Graphics::PLplot found."
+ "PDL version >= 2.4.7 and PDL::Graphics::PLplot found."
)
execute_process(
COMMAND ${PERL_EXECUTABLE}
@@ -85,20 +84,19 @@
ERROR_VARIABLE PDL_PLPLOT_VERSION
)
message(STATUS "PDL_PLPLOT_VERSION = ${PDL_PLPLOT_VERSION}")
- transform_version(NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION "0.47.0")
+ transform_version(NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION "0.55.0")
transform_version(NUMERICAL_PDL_PLPLOT_VERSION "${PDL_PLPLOT_VERSION}.0")
#message("NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION = ${NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION}")
#message("NUMERICAL_PDL_PLPLOT_VERSION = ${NUMERICAL_PDL_PLPLOT_VERSION}")
if(NUMERICAL_PDL_PLPLOT_VERSION LESS "${NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION}")
message(STATUS "WARNING: "
- "perl PDL PLplot version < 0.47\n"
- " Using limited set of Perl/PDL examples that work with this old version")
- set(HAVE_PDL_GRAPHICS_PLPLOT_40 OFF CACHE BOOL "PDL-Graphics-PLplot version is 0.47 or higher" FORCE)
+ "perl PDL PLplot version < 0.55\n"
+ " Drop testing of Perl/PDL examples.")
+ set(ENABLE_pdl OFF CACHE BOOL "Enable Perl/PDL examples in tests" FORCE)
else(NUMERICAL_PDL_PLPLOT_VERSION LESS "${NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION}")
message(STATUS
- "perl PDL PLplot version >= 0.47\n"
- " Using full set of Perl/PDL examples that work with this version")
- set(HAVE_PDL_GRAPHICS_PLPLOT_40 ON CACHE BOOL "PDL-Graphics-PLplot version is 0.47 or higher" FORCE)
+ "perl PDL PLplot version >= 0.55\n"
+ " Test Perl/PDL examples")
endif(NUMERICAL_PDL_PLPLOT_VERSION LESS "${NUMERICAL_PDL_PLPLOT_MINIMUM_VERSION}")
else(NOT PDL_GRAPHICS_PLPLOT_RETURN_CODE)
message(STATUS "WARNING: "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|