diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39fe54c66a89fbefb8518808c4040d66a04edead..9d7b7b3ea940e2d02b38cf40bddb19ce21681403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,8 @@ if (falkolib_FOUND)
 	target_sources(publisher_${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/publisher_falko.cpp)
 endif()
 
-find_file(ICP wolflaser_INCLUDE_DIRS laser/processor/processor_odom_icp.h)
-if (NOT ICP_NOTFOUND)
+find_file(ICP laser/processor/processor_odom_icp.h wolflaser_INCLUDE_DIRS)
+if (NOT ICP)
 	message("Found 'processor_odom_icp.h'. Compiling publisher_odom_icp.")
 	target_sources(publisher_${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/publisher_odom_icp.cpp)
 endif ()
@@ -66,6 +66,7 @@ endif ()
 target_link_libraries(subscriber_${PROJECT_NAME}
             wolfcore
             wolflaser
+            ${catkin_LIBRARIES}
             )
 target_link_libraries(publisher_${PROJECT_NAME}
             wolfcore