octave >= 4.0

geospace-code · Mar 14, 2018 · dba3483 · dba3483
1 parent c9647d4
commit dba3483
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ if(PYTHONINTERP_FOUND)
 endif()
 
 find_package(Octave)
-if (OCTAVE_EXECUTABLE)
+if (OCTAVE_MAJOR_VERSION GREATER_EQUAL 4)
   add_test(NAME MatlabOctave COMMAND octave-cli -q Test.m
            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
 endif()

diff --git a/tests/Test.m b/tests/Test.m
@@ -69,14 +69,11 @@ function test_transforms(angleUnit,lat,lon,lat1,lon1,az,el)
   end % function
 
 disp('GNU Octave / Matlab code OK')
-end
+
+end % function
 
 
-function rad = deg2rad(deg) 
-% for Octave < 4.0
-  rad = deg * (pi / 180);
 
-end
 
 % Copyright (c) 2014-2018 Michael Hirsch, Ph.D.
 %