From 8ece1dd031d2b3a83c5b93dd7ba2f795363d68d3 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Tue, 7 Jul 2020 13:24:30 +0200 Subject: [PATCH] - adapt TrafficTest --- apps/gpu/LBM/TrafficTest/CMakeLists.txt | 14 +++++--------- gpu.cmake | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/gpu/LBM/TrafficTest/CMakeLists.txt b/apps/gpu/LBM/TrafficTest/CMakeLists.txt index 3aca643ec..15efc4350 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 79d1a3aca..35c42354f 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 -- GitLab