[segyio] 174/376: Update possible matlab paths; name file segyspec

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 09027e53b41e31a42f22d2d30565da34b58b9e7e
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date:   Mon Feb 13 16:20:54 2017 +0100

    Update possible matlab paths; name file segyspec
    
    The file cannot be named spec, because a variable in the file is called
    it and that's a matlab violation. Additionally, add cmake support for
    matlab 2016 on MacOS+linux.
---
 cmake/matlab.cmake              | 3 ++-
 mex/CMakeLists.txt              | 6 ++++--
 mex/test/{spec.m => segyspec.m} | 0
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmake/matlab.cmake b/cmake/matlab.cmake
index d2c70ab..849f250 100644
--- a/cmake/matlab.cmake
+++ b/cmake/matlab.cmake
@@ -50,7 +50,7 @@ ELSE(WIN32)
 
     # Search for a version of Matlab available, starting from the most modern
     # one to older versions
-      FOREACH(MATVER "R2013b" "R2013a" "R2012b" "R2012a" "R2011b" "R2011a" "R2010b" "R2010a" "R2009b" "R2009a" "R2008b")
+      FOREACH(MATVER "2016b" "2014b" "R2013b" "R2013a" "R2012b" "R2012a" "R2011b" "R2011a" "R2010b" "R2010a" "R2009b" "R2009a" "R2008b")
         IF((NOT DEFINED MATLAB_ROOT) OR ("${MATLAB_ROOT}" STREQUAL ""))
           IF(EXISTS /Applications/MATLAB_${MATVER}.app)
             SET(MATLAB_ROOT /Applications/MATLAB_${MATVER}.app)
@@ -79,6 +79,7 @@ ELSE(WIN32)
     FIND_PROGRAM(MATLAB_MEX
             mex
             PATHS
+            /prog/matlab/R2016B/bin # Statoil location
             /prog/matlab/R2014B/bin # Statoil location
             ${MATLAB_ROOT}/bin
             /opt/matlab/bin
diff --git a/mex/CMakeLists.txt b/mex/CMakeLists.txt
index 6a90949..66bb167 100644
--- a/mex/CMakeLists.txt
+++ b/mex/CMakeLists.txt
@@ -61,6 +61,8 @@ install(FILES
         ${CMAKE_INSTALL_PREFIX}/matlab)
 
 if(BUILD_MEX_TESTS)
-    add_matlab_test(matlab.segyspec test/spec.m test_segyspec_mex)
-    add_matlab_test(matlab.segy     test/segy.m test_segy_mex)
+    configure_file(${testdata}/small.sgy    test/test-data/small.sgy     COPYONLY)
+    configure_file(${testdata}/small-ps.sgy test/test-data/small-ps.sgy  COPYONLY)
+    add_matlab_test(matlab.spec test/segyspec.m)
+    add_matlab_test(matlab.segy test/segy.m)
 endif()
diff --git a/mex/test/spec.m b/mex/test/segyspec.m
similarity index 100%
rename from mex/test/spec.m
rename to mex/test/segyspec.m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git