Merge branch 'master' into next

cmake/modules/BuildMex.cmake

@@ -30,6 +30,7 @@ endif()
 # SOURCE = list of source files
 # LIBRARIES = libraries needed to link mex library
 FUNCTION(BuildMex)
+  if(NOT DisableMEX)
     set(oneValueArgs MEXNAME)
     set(multiValueArgs SOURCES LIBRARIES)
     cmake_parse_arguments(BuildMex "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -57,5 +58,6 @@ FUNCTION(BuildMex)
     target_link_libraries(${BuildMex_MEXNAME}-oct ${BuildMex_LIBRARIES} ${OCTAVE_LIBRARIES})
     install(TARGETS ${BuildMex_MEXNAME}-oct DESTINATION "${MEX_DIR}/srslte/")
     endif (OCTAVE_FOUND)
+  endif (NOT DisableMEX)
 ENDFUNCTION(BuildMex)