diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index dd058f437..9b9100f76 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -167,7 +167,7 @@ target_include_directories(signal_source_adapters
         ${GNSSSDR_SOURCE_DIR}/src/core/interfaces
 )
 
-if(ENABLE_FPGA)
+if(ENABLE_FPGA OR ENABLE_AD9361)
     target_link_libraries(signal_source_adapters
         PUBLIC
             signal_source_libs
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 93b4fba96..3506dc4f7 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -29,7 +29,7 @@ if(ENABLE_DMA_PROXY)
     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_dma-proxy.h)
 endif()
 
-if(ENABLE_AD9361 OR ENABLE_MAX2771)
+if((ENABLE_FPGA AND ENABLE_AD9361) OR ENABLE_MAX2771)
     set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_buffer_monitor.cc)
     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_buffer_monitor.h)
 endif()
@@ -123,7 +123,7 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361 OR ENABLE_PLUTOSDR)
     endif()
 endif()
 
-if(ENABLE_FPGA)
+if(ENABLE_FPGA OR ENABLE_AD9361)
     target_link_libraries(signal_source_libs
         PUBLIC
             algorithms_libs
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index fb8230fdc..7b4f4f703 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -52,7 +52,7 @@ if(ENABLE_FPGA)
     )
 endif()
 
-if(ENABLE_FPGA)
+if(ENABLE_FPGA OR ENABLE_AD9361)
     set(CORE_LIBS_SOURCES
         ${CORE_LIBS_SOURCES}
         uio_fpga.cc