strip

[nlopt.git] / cmake / FindOctave.cmake

diff --git a/cmake/FindOctave.cmake b/cmake/FindOctave.cmake
index 31d4337a6cb7a96f0d04156c6dba2efc8f6b1f12..a44ebfff4ba96dffa89ae2688007cb2807bbec6f 100644 (file)
--- 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)
 
@@ -183,11 +183,7 @@ endmacro ()
 
 # handle REQUIRED and QUIET options
 include (FindPackageHandleStandardArgs)
-if (CMAKE_VERSION LESS 2.8.3)
-  find_package_handle_standard_args (Octave DEFAULT_MSG OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES OCTAVE_VERSION_STRING)
-else ()
-  find_package_handle_standard_args (Octave REQUIRED_VARS OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES VERSION_VAR OCTAVE_VERSION_STRING)
-endif ()
+find_package_handle_standard_args (Octave REQUIRED_VARS OCTAVE_EXECUTABLE OCTAVE_ROOT_DIR OCTAVE_INCLUDE_DIRS OCTAVE_LIBRARIES VERSION_VAR OCTAVE_VERSION_STRING)
 
 
 mark_as_advanced (