From ae607866bf170721743cfcab0aed248b1f97fa2a Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Fri, 26 Jun 2020 10:00:57 +0200
Subject: [PATCH] Use new vf_add_library function in muparser.
---
cpu/CMake/VirtualFluidsMacros.cmake | 2 +-
cpu/CMakeLists.txt | 4 ++++
cpu/ThirdParty/MuParser/CMakeLists.txt | 6 ++++++
cpu/VirtualFluidsCore/CMakeLists.txt | 6 +++---
4 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 cpu/ThirdParty/MuParser/CMakeLists.txt
diff --git a/cpu/CMake/VirtualFluidsMacros.cmake b/cpu/CMake/VirtualFluidsMacros.cmake
index 4991051f0..fb7719f55 100644
--- a/cpu/CMake/VirtualFluidsMacros.cmake
+++ b/cpu/CMake/VirtualFluidsMacros.cmake
@@ -183,6 +183,6 @@ macro(buildSourceGroup targetName path)
if(NOT SOURCE_GROUP)
set(SOURCE_GROUP "general")
endif()
- message("Source group: ${SOURCE_GROUP}")
+ #message("Source group: ${SOURCE_GROUP}")
#output: SOURCE_GROUP
endmacro(buildSourceGroup)
\ No newline at end of file
diff --git a/cpu/CMakeLists.txt b/cpu/CMakeLists.txt
index a11fc6896..1441c0f21 100644
--- a/cpu/CMakeLists.txt
+++ b/cpu/CMakeLists.txt
@@ -157,6 +157,10 @@ ENDIF()
# add_subdirectory(Plugins/dem_coupling)
#ENDIF()
+include (${PROJECT_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
+
+add_subdirectory(ThirdParty/MuParser)
+
add_subdirectory(VirtualFluidsCore)
add_subdirectory(VirtualFluidsBasic)
diff --git a/cpu/ThirdParty/MuParser/CMakeLists.txt b/cpu/ThirdParty/MuParser/CMakeLists.txt
new file mode 100644
index 000000000..77dc5d1cd
--- /dev/null
+++ b/cpu/ThirdParty/MuParser/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+
+vf_add_library(BUILDTYPE static)
+
+vf_get_library_name(library_name)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include)
diff --git a/cpu/VirtualFluidsCore/CMakeLists.txt b/cpu/VirtualFluidsCore/CMakeLists.txt
index 2e7fab9f9..ab8cf7713 100644
--- a/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -4,7 +4,7 @@
#################################################################
SET(WITH_SUBFOLDERS_FOR_SG TRUE)
-INCLUDE(${SOURCE_ROOT}/ThirdParty/MuParser/CMakePackage.txt)
+#INCLUDE(${SOURCE_ROOT}/ThirdParty/MuParser/CMakePackage.txt)
#new VirtualFluids
#sINCLUDE(${SOURCE_ROOT}/VirtualFluidsCore/BoundaryConditions/CMakePackage.txt)
@@ -29,7 +29,7 @@ ENDIF()
INCLUDE(${SOURCE_ROOT}/VirtualFluidsCore/IncludsList.cmake)
#SET(CAB_ADDITIONAL_LINK_LIBRARIES muParserLib ${Boost_LIBRARIES} ${MPI_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES muParserLib ${MPI_LIBRARY})
+SET(CAB_ADDITIONAL_LINK_LIBRARIES ${MPI_LIBRARY})
IF(${USE_GCC})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} rt)
@@ -95,7 +95,7 @@ message("CAB_ADDITIONAL_LINK_LIBRARIES: " ${CAB_ADDITIONAL_LINK_LIBRARIES})
#CREATE_CAB_PROJECT(VirtualFluids STATIC)
include (${PROJECT_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
-vf_add_library(BUILDTYPE static DEPENDS VirtualFluidsBasic)
+vf_add_library(BUILDTYPE static DEPENDS VirtualFluidsBasic MuParser)
vf_get_library_name(library_name)
target_include_directories(${library_name} PRIVATE ${SOURCE_ROOT}/VirtualFluidsBasic)
--
GitLab