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

[<ai...@us...>]

Revision: 11688
          http://plplot.svn.sourceforge.net/plplot/?rev=11688&view=rev
Author:   airwin
Date:     2011-04-08 19:13:16 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
AWI for Orion Poplawski.  Use oct-config command to find octave
locations more reliably than before.

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

Modified: trunk/cmake/modules/octave.cmake
===================================================================
--- trunk/cmake/modules/octave.cmake	2011-04-07 07:30:32 UTC (rev 11687)
+++ trunk/cmake/modules/octave.cmake	2011-04-08 19:13:16 UTC (rev 11688)
@@ -1,6 +1,6 @@
 # cmake/modules/octave.cmake
 #
-# Copyright (C) 2006  Alan W. Irwin
+# Copyright (C) 2006-2010  Alan W. Irwin
 #
 # This file is part of PLplot.
 #
@@ -73,28 +73,34 @@
 endif(ENABLE_octave)
 
 if(ENABLE_octave)
+  find_program(OCTAVE_CONFIG octave-config)
+  if(OCTAVE_CONFIG)
+    message(STATUS "OCTAVE_CONFIG = ${OCTAVE_CONFIG}")
+  else(OCTAVE_CONFIG)
+    message(STATUS "WARNING: "
+    "octave-config not found. Disabling octave bindings")
+    set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE)
+  endif(OCTAVE_CONFIG)
+endif(ENABLE_octave)
+
+if(ENABLE_octave)
   #OCTAVE_VERSION is the (dotted triplet) octave version.
   execute_process(
-    COMMAND ${OCTAVE} --version
-    OUTPUT_VARIABLE _OCTAVE_VERSION
+    COMMAND ${OCTAVE_CONFIG} -p VERSION
+    OUTPUT_VARIABLE OCTAVE_VERSION
     ERROR_VARIABLE OCTAVE_ERROR
     RESULT_VARIABLE return_code
+    OUTPUT_STRIP_TRAILING_WHITESPACE
     )
   if(return_code)
     message(STATUS "OCTAVE_ERROR = ${OCTAVE_ERROR}")
     message(STATUS "WARNING: "
-    "${OCTAVE} --version generates an error (non-zero return code).  Disabling octave bindings")
+    "${OCTAVE_CONFIG} -p VERSION generates an error (non-zero return code).  Disabling octave bindings")
     set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE)
   endif(return_code)
 endif(ENABLE_octave)
 
 if(ENABLE_octave)
-  string(REGEX REPLACE
-  "^.*version ([0-9]\\.[0-9]\\.[0-9]*).*$" 
-  "\\1"
-  OCTAVE_VERSION
-  ${_OCTAVE_VERSION}
-  )
   message(STATUS "OCTAVE_VERSION = ${OCTAVE_VERSION}")
   # Logic that depends on octave version
   transform_version(NUMERICAL_OCTAVE_TESTING_MINIMUM_VERSION "2.9.0")
@@ -123,22 +129,35 @@
   # if OCTAVE_INCLUDE_PATH is defined from the previous cmake run should be
   # fine.
   if(NOT DEFINED OCTAVE_INCLUDE_PATH)
+    execute_process(
+    COMMAND ${OCTAVE_CONFIG} -p OCTINCLUDEDIR
+    OUTPUT_VARIABLE OCTAVE_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
     find_path(
     OCTAVE_INCLUDE_PATH
     oct.h
-    PATH_SUFFIXES octave-${OCTAVE_VERSION}/octave
+    PATHS ${OCTAVE_INCLUDE_DIR}
+    PATH_SUFFIXES octave
     )
 
+    execute_process(
+    COMMAND ${OCTAVE_CONFIG} -p OCTLIBDIR
+    OUTPUT_VARIABLE OCTAVE_LIB_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
     find_library(
     OCTAVE_LIBRARIES
     octave
-    PATH_SUFFIXES octave-${OCTAVE_VERSION}
+    PATHS ${OCTAVE_LIB_DIR}
     )
     
     find_library(
     OCTINTERP_LIBRARIES
     octinterp
-    PATH_SUFFIXES octave-${OCTAVE_VERSION}
+    PATHS ${OCTAVE_LIB_DIR}
     )
 
     if(OCTAVE_INCLUDE_PATH AND OCTAVE_LIBRARIES AND OCTINTERP_LIBRARIES)


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