diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc476dcc..5f56a4fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,9 +152,7 @@ if(ADD_JSON_LIB)
     add_subdirectory(${LIB_JSON_PATH})
 endif()
 
-if(ADD_CSP_LIB)
-    add_subdirectory(${CSP_LIB_PATH})
-endif()
+
 
 if(NOT BUILD_WATCHDOG)
     if(ADD_LINUX_FILES)
@@ -162,6 +160,9 @@ if(NOT BUILD_WATCHDOG)
     endif()
     add_subdirectory(${BSP_PATH})
     add_subdirectory(${COMMON_PATH})
+    if(ADD_CSP_LIB)
+        add_subdirectory(${CSP_LIB_PATH})
+    endif()
 endif()
 
 if((NOT BUILD_Q7S_SIMPLE_MODE) AND (NOT BUILD_WATCHDOG))
@@ -192,24 +193,28 @@ if((NOT BUILD_Q7S_SIMPLE_MODE) AND (NOT BUILD_WATCHDOG))
     )
 endif()
 
+if(NOT BUILD_WATCHDOG)
+    if(ADD_CSP_LIB)
+        target_link_libraries(${TARGET_NAME} PRIVATE
+            ${LIB_CSP_NAME}
+        )
+    endif()
+endif()
+
 if(ADD_ETL_LIB)
     target_link_libraries(${TARGET_NAME} PRIVATE
         ${LIB_ETL_NAME}
     )
 endif()
 
-if(ADD_CSP_LIB)
-	target_link_libraries(${TARGET_NAME} PRIVATE
-		${LIB_CSP_NAME}
-	)
-endif()
-
 if(ADD_JSON_LIB)
     target_link_libraries(${TARGET_NAME} PRIVATE
         ${LIB_JSON_NAME}
     )
 endif()
 
+
+
 target_link_libraries(${TARGET_NAME} PRIVATE
     ${LIB_CXX_FS}
 )