1 --- plplot-5.9.9/cmake/modules/octave.cmake.orig 2011-10-13 02:43:01.000000000 +0200
2 +++ plplot-5.9.9/cmake/modules/octave.cmake 2011-11-18 21:36:22.706537040 +0100
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}"
23 #message(STATUS "_OCTAVE_M_DIR = ${_OCTAVE_M_DIR}")
24 file(TO_CMAKE_PATH ${_OCTAVE_M_DIR} _OCTAVE_M_DIR)
25 #message(STATUS "(CMake) _OCTAVE_M_DIR = ${_OCTAVE_M_DIR}")
26 + endif(NOT DEFINED OCTAVE_M_DIR)
27 + message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
30 if(NOT DEFINED OCTAVE_OCT_DIR)
32 #message(STATUS "(CMake) OCTAVE_OCT_DIR = ${OCTAVE_OCT_DIR}")
33 endif(NOT DEFINED OCTAVE_OCT_DIR)
35 - # Replace the OCTAVE_PREFIX with the PLplot prefix in OCTAVE_M_DIR
38 - "${CMAKE_INSTALL_PREFIX}"
42 - message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
44 # Transform OCTAVE_OCT_DIR if prefixes not the same.
45 if(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
46 set(OCTAVE_OCT_DIR ${PLPLOT_OCTAVE_DIR})