[Plplot-cvs] SF.net SVN: plplot:[12621] trunk/cmake/modules/octave.cmake

[<and...@us...>]

Revision: 12621
          http://sourceforge.net/p/plplot/code/12621
Author:   andrewross
Date:     2013-10-23 08:46:57 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------

If CMAKE_INSTALL_PREFIX is different to the prefix used to install octave, then make sure .oct files go in ${CMAKE_INSTALL_LIBDIR}/octave , i.e. in a library directory rather than a data directory. They are binary files so should not live under CMAKE_INSTALL_DATADIR.

Modified Paths:
--------------
    trunk/cmake/modules/octave.cmake

Modified: trunk/cmake/modules/octave.cmake
===================================================================
--- trunk/cmake/modules/octave.cmake	2013-10-23 06:04:04 UTC (rev 12620)
+++ trunk/cmake/modules/octave.cmake	2013-10-23 08:46:57 UTC (rev 12621)
@@ -277,7 +277,7 @@
   
   # Transform OCTAVE_OCT_DIR if prefixes not the same.
   if(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
-    set(OCTAVE_OCT_DIR ${PLPLOT_OCTAVE_DIR})
+    set(OCTAVE_OCT_DIR ${CMAKE_INSTALL_LIBDIR}/octave)
   endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}") 
   message(STATUS "OCTAVE_OCT_DIR = ${OCTAVE_OCT_DIR}")
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.