Merge pull request #477 from analogdevicesinc/tcollins-merge-matlab-h…

…eader

MATLAB bindings cleanup

CI/travis/before_deploy

@@ -96,7 +96,7 @@ check_file tar.gz
 if [  -n "${temp}"  ] ; then
 	deploy=$(expr ${deploy} + 1)
 	if [ -z "${TARGET_TGZ}" ] ; then
-		echo Add the MATLAB bindings into the tar file
+		echo updating tar file
 		(
 		cd $(dirname ${temp})
 		if [ -d tarball_fixup ] ; then
@@ -110,10 +110,6 @@ if [  -n "${temp}"  ] ; then
 			tar -xzf ${TRAVIS_BUILD_DIR}/${temp}
 		fi
 
-		mkdir -p usr/include usr/lib/matlab/iio
-		cp ${TRAVIS_BUILD_DIR}/bindings/matlab/iio-wrapper.h usr/include/
-		cp ${TRAVIS_BUILD_DIR}/bindings/matlab/*.m usr/lib/matlab/iio/
-
 		if [ "$TRAVIS_OS_NAME" = "osx" ] ; then
 			cd usr/lib
 			ln -fs ../../Library/Frameworks/iio.framework/iio libiio.dylib

CMakeLists.txt

@@ -450,13 +450,8 @@ endif()
 
 option(CSHARP_BINDINGS "Install C# bindings" OFF)
 option(PYTHON_BINDINGS "Install Python bindings" OFF)
-option(MATLAB_BINDINGS "Build MATLAB bindings" OFF)
 add_subdirectory(bindings)
 
-if (WITH_MATLAB_BINDINGS_API)
-	list(APPEND LIBIIO_EXTRA_HEADERS bindings/matlab/iio-wrapper.h)
-endif()
-
 option(WITH_MAN "Generate on-line reference manuals (man pages)" OFF)
 add_subdirectory(man)
 

README_BUILD.md

@@ -43,7 +43,6 @@ when configuring libiio with cmake, there are a few optional settings that you c
 Cmake Options       | Default | Description                                    |
 ------------------- | ------- | ---------------------------------------------- |
 `CSHARP_BINDINGS`   | OFF | Install C# bindings                                |
-`MATLAB_BINDINGS`   | OFF | Install MATLAB bindings                            |
 `PYTHON_BINDINGS`   | OFF | Install PYTHON bindings                            |
 `WITH_DOC`          | OFF | Generate documentation with Doxygen and Sphinx     |
 `WITH_MAN`          | OFF | Generate and install man pages                     |

appveyor.yml

@@ -167,14 +167,6 @@ build_script:
 
     - copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS32
     - copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS64
-    - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MS32\matlab\
-    - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MS64\matlab\
-    - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MinGW32\matlab\
-    - xcopy /S bindings\matlab c:\%ARCHIVE_NAME%\MinGW64\matlab\
-    - del c:\%ARCHIVE_NAME%\MS32\matlab\CMakeLists.txt
-    - del c:\%ARCHIVE_NAME%\MS64\matlab\CMakeLists.txt
-    - del c:\%ARCHIVE_NAME%\MinGW32\matlab\CMakeLists.txt
-    - del c:\%ARCHIVE_NAME%\MinGW64\matlab\CMakeLists.txt
 
     - copy c:\projects\libiio\CI\travis\zip.txt c:\%ARCHIVE_NAME%\README.txt
     - 7z a "c:\libiio.zip" c:\%ARCHIVE_NAME%

bindings/CMakeLists.txt

@@ -2,10 +2,6 @@ if (CSHARP_BINDINGS)
 	add_subdirectory(csharp)
 endif()
 
-if (MATLAB_BINDINGS)
-	add_subdirectory(matlab)
-endif()
-
 if (PYTHON_BINDINGS)
 	add_subdirectory(python)
 endif()