diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 4b8115e40..ad0a01fdc 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -82,6 +82,13 @@ if( RTLSDR_DRIVER )
     add_definitions(-DRTLSDR_DRIVER=1)
 endif( RTLSDR_DRIVER )
 
+#Enable OpenCL if found in the system
+if ( OPENCL_FOUND )
+    message( "Adding processing blocks implemented using Open CL" )
+    add_definitions(-DOPENCL=1)
+endif( OPENCL_FOUND )
+
+
 add_library(gnss_rx ${GNSS_RECEIVER_SOURCES})
 target_link_libraries(gnss_rx ${Boost_LIBRARIES} ${ARMADILLO_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} 
       gnss_system_parameters gnss_sp_libs 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index bc017b6e2..2f41f2b5b 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -36,6 +36,7 @@ add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
 if(OS_IS_MACOSX)
      # Tell the linker where the libraries installed by MacPorts are
      link_directories( /opt/local/lib ) # Not very elegant, to be fixed
+     set(MAC_LIBRARIES "-lstdc++")
 endif(OS_IS_MACOSX)
 
 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)