1 --- plplot-5.9.6/cmake/modules/octave.cmake~ 2010-06-05 18:11:39.000000000 +0200
2 +++ plplot-5.9.6/cmake/modules/octave.cmake 2010-07-28 19:03:30.645624474 +0200
5 # octave-2.1 (or higher) logic.
7 + if(NOT DEFINED OCTAVE_M_DIR)
8 file(WRITE ${CMAKE_BINARY_DIR}/octave_command
9 "printf(octave_config_info(\"localfcnfiledir\"));"
12 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
13 OUTPUT_VARIABLE _OCTAVE_M_DIR
15 + # Replace the OCTAVE_PREFIX with the PLplot prefix in OCTAVE_M_DIR
18 + "${CMAKE_INSTALL_PREFIX}"
22 + endif(NOT DEFINED OCTAVE_M_DIR)
23 + message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
26 if(NOT DEFINED OCTAVE_OCT_DIR)
27 file(WRITE ${CMAKE_BINARY_DIR}/octave_command
30 endif(NOT DEFINED OCTAVE_OCT_DIR)
32 - # Replace the OCTAVE_PREFIX with the PLplot prefix in OCTAVE_M_DIR
35 - "${CMAKE_INSTALL_PREFIX}"
39 - message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
41 # Transform OCTAVE_OCT_DIR if prefixes not the same.
42 if(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
43 set(OCTAVE_OCT_DIR ${PLPLOT_OCTAVE_DIR})