From 33f29521904c5dca05217326f62dc98a5ea931da Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Fri, 12 Mar 2021 10:51:35 +0100 Subject: [PATCH] Use cmake macros in simulationconfig library. --- src/cpu/simulationconfig/CMakeLists.txt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/cpu/simulationconfig/CMakeLists.txt b/src/cpu/simulationconfig/CMakeLists.txt index 2e5e7f2eb..a18eb7237 100644 --- a/src/cpu/simulationconfig/CMakeLists.txt +++ b/src/cpu/simulationconfig/CMakeLists.txt @@ -1,20 +1,8 @@ -cmake_minimum_required(VERSION 3.1) project(simulationconfig) -set(VFBUILDER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) -file(GLOB HEADERS - ${VFBUILDER_INCLUDE_DIR}/simulationconfig/*.h - ${VFBUILDER_INCLUDE_DIR}/simulationconfig/boundaryconditions/*.h) - -file(GLOB SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) - -add_library(simulationconfig STATIC ${SRC} ${HEADERS}) +vf_add_library(NAME simulationconfig PUBLIC_LINK basics muparser MPI::MPI_CXX ${VF_LIBRARIES} PRIVATE_LINK lbm) set_target_properties(simulationconfig PROPERTIES CXX_STANDARD 14 POSITION_INDEPENDENT_CODE ON) -target_include_directories(simulationconfig PUBLIC ${VFBUILDER_INCLUDE_DIR}) -target_link_libraries(simulationconfig PRIVATE VirtualFluidsCore basics muparser) -target_compile_definitions(simulationconfig PRIVATE VF_METIS VF_MPI) -target_include_directories(simulationconfig PUBLIC ${CMAKE_BINARY_DIR}) - +target_include_directories(simulationconfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -- GitLab