Remove merge conflict artefact.

Exclude the cmake .in.h file from the cmake target.

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")

src/basics/CMakeLists.txt

 
 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)