From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sat, 2 Jun 2018 14:17:56 +0000 (+0200)
Subject: Use OCTAVE_HOME to determine octave root dir.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0fe575729b613c17f3e1e5d865c4085cc0d01eb5;p=nlopt.git

Use OCTAVE_HOME to determine octave root dir.

The keyword PREFIX is no longer supported by octave-config and
OCTAVE_HOME is to be used in its stead. See
https://hg.savannah.gnu.org/hgweb/octave/rev/b95c430c0649
---

diff --git a/cmake/FindOctave.cmake b/cmake/FindOctave.cmake
index 31d4337..b31d305 100644
--- a/cmake/FindOctave.cmake
+++ b/cmake/FindOctave.cmake
@@ -68,7 +68,7 @@ find_program(OCTAVE_CONFIG_EXECUTABLE
 
 
 if (OCTAVE_CONFIG_EXECUTABLE)
-  execute_process (COMMAND ${OCTAVE_CONFIG_EXECUTABLE} -p PREFIX
+  execute_process (COMMAND ${OCTAVE_CONFIG_EXECUTABLE} -p OCTAVE_HOME
                     OUTPUT_VARIABLE OCTAVE_ROOT_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)