diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089adacb1cffc0224bc2464b54fe8e83762875e9..80ba82f2c9ce86a367d952b6f8cdecbd26f767b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,18 +35,19 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 # Project dependencies
 SET(CATKIN_REQUIRED_COMPONENTS roscpp std_msgs message_generation std_srvs geometry_msgs sensor_msgs tf2_ros
     realtime_tools)
+FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options)
 
 IF(BUILD_PYTHON_INTERFACE)
   FINDPYTHON()
+  SEARCH_FOR_BOOST_PYTHON()
   STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
-  ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED
+  ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED
     PKG_CONFIG_REQUIRES dynamic-graph-python)
   SET(CATKIN_REQUIRED_COMPONENTS ${CATKIN_REQUIRED_COMPONENTS} rospy)
 ENDIF(BUILD_PYTHON_INTERFACE)
 
 find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
 
-SEARCH_FOR_BOOST()
 
 ADD_PROJECT_DEPENDENCY(sot-core REQUIRED PKG_CONFIG_REQUIRES sot-core)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1917df3b2213cb6ee544987b57ab69997284028..fef176b96cd7b8a8e79deae5bcc6f2973010104d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,13 +50,13 @@ ENDIF(BUILD_PYTHON_INTERFACE)
 
 # Stand alone embedded intepreter with a robot controller.
 add_executable(geometric_simu geometric_simu.cpp sot_loader.cpp sot_loader_basic.cpp)
-target_link_libraries(geometric_simu ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
+target_link_libraries(geometric_simu Boost::program_options ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
 pkg_config_use_dependency(geometric_simu dynamic_graph_bridge_msgs)
 install(TARGETS geometric_simu
   DESTINATION lib/${PROJECT_NAME})
 
 # Sot loader library
 add_library(sot_loader sot_loader.cpp sot_loader_basic.cpp)
-target_link_libraries(sot_loader ${Boost_LIBRARIES} ${catkin_LIBRARIES} ros_bridge)
+target_link_libraries(sot_loader Boost::program_options ${catkin_LIBRARIES} ros_bridge)
 pkg_config_use_dependency(sot_loader dynamic_graph_bridge_msgs)
 install(TARGETS sot_loader EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)