diff --git a/platformio/ide/tpls/clion/CMakeLists.txt.tpl b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
index 63274c43..075bc805 100644
--- a/platformio/ide/tpls/clion/CMakeLists.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
@@ -51,4 +51,18 @@ add_custom_target(
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+    add_custom_target(
+        CODE_COMPLETION_PIOLIB
+        SOURCES lib
+    )
+endif()
+
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/.piolibdeps)
+    add_custom_target(
+        CODE_COMPLETION_PIOLIBDEPS
+        SOURCES .piolibdeps
+    )
+endif()
+
 add_executable(${PROJECT_NAME} ${SRC_LIST})