diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index f48643682..b330bcc0f 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -38,5 +38,5 @@ include_directories(
 )
 
 add_library(pvt_lib ${PVT_LIB_SOURCES})
+add_dependencies(pvt_lib armadillo-${armadillo_RELEASE} glog-${glog_RELEASE})
 target_link_libraries(pvt_lib ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES} ${ARMADILLO_LIBRARIES} )
-add_dependencies(input_filter_adapters armadillo-${armadillo_RELEASE} glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index 17ee8f9cc..fc0f9abcd 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -29,5 +29,5 @@ include_directories(
 )
 
 add_library(datatype_adapters ${DATATYPE_ADAPTER_SOURCES})
+add_dependencies(datatype_adapters glog-${glog_RELEASE})
 target_link_libraries(datatype_adapters ${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
-add_dependencies(datatype_adapters glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 9be5e8c6a..752c3bc07 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -31,5 +31,5 @@ include_directories(
 )
 
 add_library(input_filter_adapters ${INPUT_FILTER_ADAPTER_SOURCES})
+add_dependencies(input_filter_adapters glog-${glog_RELEASE})
 target_link_libraries(input_filter_adapters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES})
-add_dependencies(input_filter_adapters glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index 4abf5821b..9dcdba1b3 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -34,5 +34,5 @@ include_directories(
 )
 
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} )
+add_dependencies(obs_gr_blocks glog-${glog_RELEASE})
 target_link_libraries(obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
-add_dependencies(obs_gr_blocks glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index 609beef5e..c4ec759bf 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -49,5 +49,6 @@ include_directories(
 link_directories(${Boost_LIBRARY_DIR})
 
 add_library(gnss_system_parameters ${SYSTEM_PARAMETERS_SOURCES})
-target_link_libraries(gnss_system_parameters ${Boost_LIBRARIES})
 add_dependencies(gnss_system_parameters glog-${glog_RELEASE})
+target_link_libraries(gnss_system_parameters ${Boost_LIBRARIES})
+