diff --git a/apps/gpu/LBM/TrafficTest/CMakeLists.txt b/apps/gpu/LBM/TrafficTest/CMakeLists.txt
index 3aca643ec2eb4a4a2585c39c7653019b55af3805..15efc435033ecade76ad4895459590c39e031adc 100644
--- a/apps/gpu/LBM/TrafficTest/CMakeLists.txt
+++ b/apps/gpu/LBM/TrafficTest/CMakeLists.txt
@@ -1,17 +1,13 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
 
-set(linkDirectories "")
-set(libsToLink Traffic)
 set(includeDirectories "${CMAKE_SOURCE_DIR}/src" 
                        "${CMAKE_SOURCE_DIR}/src/Traffic"
                        "${CMAKE_SOURCE_DIR}/src/GridGenerator"
                        "${CMAKE_SOURCE_DIR}/src/Core")
 
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
 
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${lbmAppFolder})
 
-# Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
\ No newline at end of file
+vf_add_library(BUILDTYPE binary DEPENDS Traffic)
+
+vf_get_library_name(library_name)
+target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/basics")
+target_include_directories(${library_name} PRIVATE "${CMAKE_SOURCE_DIR}/src/gpu")
\ No newline at end of file
diff --git a/gpu.cmake b/gpu.cmake
index 79d1a3aca9f7e3f5b58d2b4c837cd66d2e2bf5ed..35c42354f635f391bf4645ac33bc873f9a5570dd 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -229,5 +229,5 @@ endif()
 if(VF.BUILD_VF_TRAFFIC)
     add_subdirectory(src/gpu/Traffic)
 
-    #add_subdirectory(targets/apps/LBM/TrafficTest)
+    add_subdirectory(apps/gpu/LBM/TrafficTest)
 endif()
\ No newline at end of file