Generalize matio static libs option to matlab in addition to python (143be5e4).

.gitlab-ci.yml

@@ -136,7 +136,7 @@ package_linux_release:
 package_linux_release_static:
    script:
         - if [[ ! -d 'build' ]]; then  mkdir build;fi; cd build
-        - 'cmake -DBUILD_WRAPPER_PYTHON=ON -DBUILD_WRAPPER_MATLAB=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=/opt/local/faust -DCPACK_PACKAGE_FILE_NAME=faust-$CI_COMMIT_TAG-static -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG -DEXCLUDE_FAUST_LIB_INSTALL=ON -DPYTHON_USES_MATIO_STATIC_LIBS=ON -DMATIO_STATIC_LIB_PATH=/opt/local/matio-1.5.7/src/.libs/libmatio.a -DZ_STATIC_LIB_PATH=/opt/local/zlib-1.2.11/libz.a -DHDF5_STATIC_LIB_PATH=/opt/local/hdf5-1.8.18/src/.libs/libhdf5.a ..'
+        - 'cmake -DBUILD_WRAPPER_PYTHON=ON -DBUILD_WRAPPER_MATLAB=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=/opt/local/faust -DCPACK_PACKAGE_FILE_NAME=faust-$CI_COMMIT_TAG-static -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG -DEXCLUDE_FAUST_LIB_INSTALL=ON -DUSE_MATIO_STATIC_LIBS=ON -DMATIO_STATIC_LIB_PATH=/opt/local/matio-1.5.7/src/.libs/libmatio.a -DZ_STATIC_LIB_PATH=/opt/local/zlib-1.2.11/libz.a -DHDF5_STATIC_LIB_PATH=/opt/local/hdf5-1.8.18/src/.libs/libhdf5.a ..'
         - make
         - cpack -G RPM -C CPackConfig.cmake
         - cpack -G DEB -C CPackConfig.cmake

CMake/findExternalLibs.cmake

@@ -111,9 +111,25 @@ if (BUILD_WRAPPER_MATLAB)
 	include(CMake/findMatlab.cmake)
 endif(BUILD_WRAPPER_MATLAB)
 ######## MATIO INCLUDE AND LIBRARY ##################
-if (BUILD_READ_MAT_FILE)
-	include(CMake/findMATIOLib.cmake)
-endif(BUILD_READ_MAT_FILE)
+# we always use matio (faust's functionality, not just for testing)
+if(${USE_MATIO_STATIC_LIBS})
+	if(NOT MATIO_STATIC_LIB_PATH OR NOT Z_STATIC_LIB_PATH OR NOT HDF5_STATIC_LIB_PATH)
+		message(FATAL_ERROR "When you set USE_MATIO_STATIC_LIBS to ON the variables MATIO_STATIC_LIB_PATH, Z_STATIC_LIB_PATH and HDF5_STATIC_LIB_PATH must be set to the full paths of static libs (.a)")
+	endif()
+	if(NOT EXISTS ${MATIO_STATIC_LIB_PATH})
+		message(FATAL_ERROR "The filepath for matio doesn't exist: ${MATIO_STATIC_LIB_PATH}")
+	elseif(NOT EXISTS ${Z_STATIC_LIB_PATH})
+		message(FATAL_ERROR "The filepath for zlib doesn't exist: ${Z_STATIC_LIB_PATH}")
+	elseif(NOT EXISTS ${HDF5_STATIC_LIB_PATH})
+		message(FATAL_ERROR "The filepath for hdf5 lib doesn't exist: ${HDF5_STATIC_LIB_PATH}")
+	endif()
+	add_library(MATIO_STATIC_LIB STATIC IMPORTED GLOBAL)
+	add_library(Z_STATIC_LIB STATIC IMPORTED GLOBAL)
+	add_library(HDF5_STATIC_LIB STATIC IMPORTED GLOBAL)
+endif()
+#if (BUILD_READ_MAT_FILE)
+include(CMake/findMATIOLib.cmake)
+#endif(BUILD_READ_MAT_FILE)
 ######## XML INCLUDE AND LIBRARY ##################
 if (BUILD_READ_XML_FILE)
 	include(CMake/findXML2Lib.cmake)

CMakeLists.txt

@@ -209,7 +209,7 @@ option(BUILD_READ_MAT_FILE "Using matio library to read mat files" ON)
 
 option(BUILD_WRAPPER_PYTHON "Enable building PyFaust (Python librairie)." OFF)
 #set(BUILD_WRAPPER_PYTHON OFF)
-option(PYTHON_USES_MATIO_STATIC_LIBS OFF) # if ON the script waits several variables to
+option(USE_MATIO_STATIC_LIBS OFF) # if ON the script waits several variables to
 # be set: MATIO_STATIC_LIB_PATH, Z_STATIC_LIB_PATH, HDF5_STATIC_LIB_PATH
 #CMAKE_DEPENDENT_OPTION
 
@@ -871,18 +871,18 @@ ELSE(WIN32 AND NOT UNIX)
 #SET (CPACK_RPM_PACKAGE_REQUIRES )
 #set(CPACK_RPM_COMPONENT_INSTALL ON)
 
-set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "/opt")
+set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "/opt") # to not conflict with filesystem package on fedora
 
-set(CPACK_RPM_PACKAGE_REQUIRES "matio >= 1.5.7")
-#TODO: set(CPACK_DEBIAN_PACKAGE_DEPENDS "matio")
+if(NOT ${USE_MATIO_STATIC_LIBS})
+	set(CPACK_RPM_PACKAGE_REQUIRES "matio >= 1.5.7")
+	#set(CPACK_DEBIAN_PACKAGE_DEPENDS "matio")
+endif()
 if(BUILD_WRAPPER_PYTHON)
 	#set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, python3 >= 3.6.5, python3-numpy >= 1.13.3, python3-scipy >= 1.0.0")
-	#TODO: set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, python3, python3-numpy, python3-scipy)
-endif()
-if(BUILD_WRAPPER_MATLAB)
-	#TODO: for debian package also ?
-	set(CPACK_RPM_SPEC_MORE_DEFINE "%define __requires_exclude ^libmex[.]so.*|libmat[.]so.*|libmx[.]so.*|libpython.*[.]so.*$ ")
+	#set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, python3, python3-numpy, python3-scipy)
 endif()
+#TODO: for debian package also ?
+set(CPACK_RPM_SPEC_MORE_DEFINE "%define __requires_exclude ^libmex[.]so.*|libmat[.]so.*|libmx[.]so.*|libpython.*[.]so.*$ ")
 
 set(CPACK_RPM_PACKAGE_RELEASE "1")
 SET(CPACK_RPM_PACKAGE_LICENSE "GNU AFFERO GENERAL PUBLIC LICENSE")

wrapper/matlab/CMakeLists.txt

@@ -61,11 +61,15 @@ endif()
 
 if(UNIX)
     # we always use matio
-    string(REGEX REPLACE "^(.+)/.*$" "-L\\1" LDD_MEX_FLAGS "${MATIO_LIB_FILE}")
-    set(LDD_MEX_FLAGS ${LDD_MEX_FLAGS} "-L${FAUST_BIN_DIR}" "-l${FAUST_TARGET}" "-lmatio")
-	if(BUILD_OPENBLAS)
-		set(LDD_MEX_FLAGS "${LDD_MEX_FLAGS}" "${OPENBLAS_LIB_FILE}")
-	endif()
+    if(${USE_MATIO_STATIC_LIBS})
+	    set(LDD_MEX_FLAGS ${LDD_MEX_FLAGS} "-L${FAUST_BIN_DIR}" "-l${FAUST_TARGET}" "${MATIO_STATIC_LIB_PATH}" "${HDF5_STATIC_LIB_PATH}" "${Z_STATIC_LIB_PATH}")
+    else()
+	    string(REGEX REPLACE "^(.+)/.*$" "-L\\1" LDD_MEX_FLAGS "${MATIO_LIB_FILE}")
+	    set(LDD_MEX_FLAGS ${LDD_MEX_FLAGS} "-L${FAUST_BIN_DIR}" "-l${FAUST_TARGET}" "-lmatio")
+    endif()
+    if(BUILD_OPENBLAS)
+	set(LDD_MEX_FLAGS "${LDD_MEX_FLAGS}" "${OPENBLAS_LIB_FILE}")
+    endif()
 elseif(WIN32)
 	# MODIF ALALAL
 	#set(LDD_MEX_FLAGS "-L${FAUST_BIN_DIR}" "-l${FAUST_TARGET}")

wrapper/python/CMakeLists.txt

 
 set(FAUST_PYTHON_LIB_DIR "'${FAUST_BIN_DIR}'")
 
-if(${PYTHON_USES_MATIO_STATIC_LIBS})
-	if(NOT MATIO_STATIC_LIB_PATH OR NOT Z_STATIC_LIB_PATH OR NOT HDF5_STATIC_LIB_PATH)
-		message(FATAL_ERROR "When you set PYTHON_USES_MATIO_STATIC_LIBS to ON the variables MATIO_STATIC_LIB_PATH, Z_STATIC_LIB_PATH and HDF5_STATIC_LIB_PATH must be set to the full paths of static libs (.a)")
-	endif()
-	if(NOT EXISTS ${MATIO_STATIC_LIB_PATH})
-		message(FATAL_ERROR "The filepath for matio doesn't exist: ${MATIO_STATIC_LIB_PATH}")
-	elseif(NOT EXISTS ${Z_STATIC_LIB_PATH})
-		message(FATAL_ERROR "The filepath for zlib doesn't exist: ${Z_STATIC_LIB_PATH}")
-	elseif(NOT EXISTS ${HDF5_STATIC_LIB_PATH})
-		message(FATAL_ERROR "The filepath for hdf5 lib doesn't exist: ${HDF5_STATIC_LIB_PATH}")
-	endif()
+if(${USE_MATIO_STATIC_LIBS})
+
 	set(PYTHON_EXT_EXTRA_OBJECTS "[ '${MATIO_STATIC_LIB_PATH}', '${HDF5_STATIC_LIB_PATH}', '${Z_STATIC_LIB_PATH}']") # the order matters for compilation
 else()
 	set(PYTHON_EXT_EXTRA_OBJECTS "None")