Refactor raw coded data about matio from setup.py.in to CMakeLists.txt.

It's more consistent with the way BLAS lib is processed for setup.py generation.
It modifies what's done in 2aac8ad7.

wrapper/python/CMakeLists.txt

@@ -9,11 +9,17 @@ set(FAUST_PYTHON_INCLUDE_DIR "'${EIGEN_INC_DIR}',
 			'${FAUST_PYTHON_SRC_DIR}',
 			'${FAUST_PYTHON_SRC_SRC_DIR}',
 			'${FAUST_LINEAR_OPERATOR_CPU_SRC_DIR}',
-			'${FAUST_ALGORITHM_CONSTRAINT_SRC_DIR}', 
-			'${FAUST_ALGORITHM_FACTORIZATION_SRC_DIR}'")
+			'${FAUST_ALGORITHM_CONSTRAINT_SRC_DIR}',
+			'${FAUST_ALGORITHM_FACTORIZATION_SRC_DIR}',
+			'${MATIO_INC_DIR}'")
 
 
-set(FAUST_PYTHON_LIB_DIR "'${FAUST_BIN_DIR}'")
+get_filename_component(MATIO_LIB_DIR ${MATIO_LIB_FILE} DIRECTORY)
+get_filename_component(MATIO_LIB_NAME ${MATIO_LIB_FILE} NAME_WE)
+string(REGEX REPLACE "^lib" "" MATIO_LIB_NAME ${MATIO_LIB_NAME})
+
+set(FAUST_PYTHON_LIB_DIR "'${FAUST_BIN_DIR}', '${MATIO_LIB_DIR}'")
+set(FAUST_PYTHON_LIBS ",'${MATIO_LIB_NAME}'")
 
 if(BUILD_OPENBLAS)
 	
@@ -25,7 +31,7 @@ if(BUILD_OPENBLAS)
 			'${OPENBLAS_INC_DIR}'")
 	set(FAUST_PYTHON_LIB_DIR "${FAUST_PYTHON_LIB_DIR},
 			'${OPENBLAS_LIB_DIR}'")
-	set(FAUST_PYTHON_LIB ",'openblas'")
+	set(FAUST_PYTHON_LIBS "${FAUST_PYTHON_LIBS},'openblas'")
 endif(BUILD_OPENBLAS)
 
 #move quickstart demo file

wrapper/python/setup.py.in

@@ -43,15 +43,12 @@ from distutils.core import setup, Extension
 from Cython.Build import cythonize
 import numpy
 
-PyFaust = Extension(
-	'FaustCorePy',
-	sources = ['@FAUST_PYTHON_BIN_DIR@/FaustCorePy.pyx'],
-	language = 'c++',
-	include_dirs=[@FAUST_PYTHON_INCLUDE_DIR@
-			,numpy.get_include()],
-		     
+PyFaust = Extension('FaustCorePy',
+    sources = ['@FAUST_PYTHON_BIN_DIR@/FaustCorePy.pyx'],
+    language = 'c++',
+    include_dirs=[@FAUST_PYTHON_INCLUDE_DIR@, numpy.get_include()],
     library_dirs=[@FAUST_PYTHON_LIB_DIR@],
-    libraries=['faust'@FAUST_PYTHON_LIB@,'matio'],
+    libraries=['faust'@FAUST_PYTHON_LIBS@],
     extra_compile_args = [ "-std=c++11"]
 )