Merge branch 'next' of https://github.com/srsLTE/srsLTE into next

README.md

@@ -30,6 +30,8 @@ Hardware
 
 The library currently uses Ettus Universal Hardware Driver (UHD). Thus, any hardware supported by UHD can be used. There is no sampling rate conversion, therefore the hardware should support 30.72 MHz clock in order to work correctly with LTE sampling frequencies and decode signals from live LTE base stations. We are using the B210 USRP. 
 
+*News*: We have recently added support for the bladeRF in the `devel` branch. It's still experimental so any feedback will be very appreciated. 
+
 Download & Install Instructions
 =================================
 

cmake/modules/BuildMex.cmake

@@ -30,10 +30,11 @@ endif()
 # SOURCE = list of source files
 # LIBRARIES = libraries needed to link mex library
 FUNCTION(BuildMex)
-  set(oneValueArgs MEXNAME)
-  set(multiValueArgs SOURCES LIBRARIES)
-  cmake_parse_arguments(BuildMex "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  if (MATLAB_FOUND)
+  if(NOT DisableMEX)
+    set(oneValueArgs MEXNAME)
+    set(multiValueArgs SOURCES LIBRARIES)
+    cmake_parse_arguments(BuildMex "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    if (MATLAB_FOUND)
     add_library(${BuildMex_MEXNAME}-mat SHARED ${BuildMex_SOURCES})
     #target_include_directories(${BuildMex_MEXNAME}-mat PUBLIC ${MATLAB_INCLUDE_DIR})
     set_target_properties(${BuildMex_MEXNAME}-mat PROPERTIES
@@ -44,8 +45,8 @@ FUNCTION(BuildMex)
       )
     target_link_libraries(${BuildMex_MEXNAME}-mat ${BuildMex_LIBRARIES} ${MATLAB_MEX_LIBRARY})
     install(TARGETS ${BuildMex_MEXNAME}-mat DESTINATION "${MEX_DIR}/srslte/")
-  endif(MATLAB_FOUND)
-  if (OCTAVE_FOUND) 
+    endif(MATLAB_FOUND)
+    if (OCTAVE_FOUND)
     add_library(${BuildMex_MEXNAME}-oct SHARED ${BuildMex_SOURCES})
     #target_include_directories(${BuildMex_MEXNAME}-oct PUBLIC ${OCTAVE_INCLUDE_DIR})
     set_target_properties(${BuildMex_MEXNAME}-oct PROPERTIES
@@ -56,6 +57,7 @@ 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 (OCTAVE_FOUND)
+  endif (NOT DisableMEX)
 ENDFUNCTION(BuildMex)