Use new vf_add_library function in muparser.

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

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)
 

cpu/ThirdParty/MuParser/CMakeLists.txt

+
+
+vf_add_library(BUILDTYPE static)
+
+vf_get_library_name(library_name)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include)

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)