diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index e929c3ffc..0a44d3454 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -32,9 +32,9 @@ include_directories(
 )
 
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
      add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
 
 
 file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 53ad528e9..4f6f226b1 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -60,14 +60,16 @@ set (SIGNAL_SOURCE_LIB_SOURCES
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${Boost_INCLUDE_DIRS}
+     ${GLOG_INCLUDE_DIRS}
      ${OPT_DRIVER_INCLUDE_DIRS}
 )
 
 
 file(GLOB SIGNAL_SOURCE_LIB_HEADERS "*.h")
 list(SORT SIGNAL_SOURCE_LIB_HEADERS)
+list(SORT SIGNAL_SOURCE_LIB_SOURCES)
 add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
-
+add_dependencies(signal_source_lib glog-${glog_RELEASE})
 target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
 
diff --git a/src/algorithms/signal_source/libs/ad9361_manager.cc b/src/algorithms/signal_source/libs/ad9361_manager.cc
index 51a949eed..b0a41bd55 100644
--- a/src/algorithms/signal_source/libs/ad9361_manager.cc
+++ b/src/algorithms/signal_source/libs/ad9361_manager.cc
@@ -31,7 +31,7 @@
  */
 #include "ad9361_manager.h"
 #include <glog/logging.h>
-#include <math.h>
+#include <cmath>
 #include <iostream>
 #include <sstream>
 
@@ -309,7 +309,6 @@ bool config_ad9361_rx_remote(std::string remote_host,
     rxcfg.lo_hz = freq_;                     // 2.5 GHz rf frequency
     rxcfg.rfport = rf_port_select_.c_str();  // port A (select for rf freq.)
 
-
     std::cout << "AD9361 Acquiring IIO REMOTE context in host " << remote_host << std::endl;
     struct iio_context *ctx;
     // Streaming devices
@@ -489,7 +488,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
             std::cout << "Failed to set TX DDS frequency Q: " << ret << std::endl;
         }
 
-
     ret = iio_channel_attr_write_double(dds_channel0_I, "phase", 0.0);
     if (ret < 0)
         {
@@ -516,7 +514,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
 
     //disable TX2
 
-
     ret = iio_device_attr_write_double(ad9361_phy, "out_voltage1_hardwaregain", -89.0);
     if (ret < 0)
         {
@@ -529,7 +526,6 @@ bool config_ad9361_lo_local(unsigned long bandwidth_,
     struct iio_channel *dds_channel1_Q;
     dds_channel1_Q = iio_device_find_channel(dds, "TX2_Q_F1", true);
 
-
     ret = iio_channel_attr_write_double(dds_channel1_I, "scale", 0);
     if (ret < 0)
         {
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 0e12422a6..e632d6833 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -90,9 +90,9 @@ if(ENABLE_FMCOMMS2)
 	set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
 endif(ENABLE_FMCOMMS2)
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
      add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
 
 
 include_directories(
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b4355ed4e..82f4e97d9 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -161,9 +161,9 @@ if(GNUPLOT_FOUND)
     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")
 endif(GNUPLOT_FOUND)
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
      add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
 
 
 ################################################################################