From 7edf553c2d9b3dc4217021f251bbe72efe627020 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Tue, 8 Sep 2020 13:21:20 +0200
Subject: [PATCH] Remove merge conflict artefact. Exclude the cmake .in.h file
from the cmake target.
---
cpu.cmake | 4 ----
src/basics/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/cpu.cmake b/cpu.cmake
index 3740f1bce..1b8d3b383 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -39,10 +39,6 @@ SET(USE_GCC OFF CACHE BOOL "include gcc compiler support") #TODO: why do we need
SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
-<<<<<<< HEAD
-
-=======
->>>>>>> feature/clean_3rd_cmake_macros
#CAB
include("CMake/CMakeCABMacros.cmake") #TODO: Currently we have to include the CABMacros also here, so that the USE_* are defined in the config files for the cpu version
#include("CMake/FileUtilities.cmake")
diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt
index 0b643212a..ff6c0c122 100644
--- a/src/basics/CMakeLists.txt
+++ b/src/basics/CMakeLists.txt
@@ -1,7 +1,7 @@
include(Core/buildInfo.cmake)
-vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp)
+vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp VirtualFluidsDefinitions.in.h)
vf_get_library_name (library_name)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Core)
--
GitLab