From dce299e6702db2de528ac6fba14ebd4de4016068 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 1 Jul 2020 16:00:04 +0200
Subject: [PATCH] Small CMake Fixes. cpu and gpu made use of same basics source
code.
---
CMake/FileUtilities.cmake | 2 +-
CMake/VirtualFluidsMacros.cmake | 6 ++++--
cpu/Applications/IncludsList.cmake | 12 +++++++++++-
cpu/VirtualFluidsCore/CMakeLists.txt | 20 ++++++++++----------
src/basics/basics/container/CbArray4D.h | 2 +-
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/CMake/FileUtilities.cmake b/CMake/FileUtilities.cmake
index 7b39fb79f..2cd8e1ac0 100644
--- a/CMake/FileUtilities.cmake
+++ b/CMake/FileUtilities.cmake
@@ -109,7 +109,7 @@ macro(generateExportHeader libName)
GENERATE_EXPORT_HEADER (${libName}
#BASE_NAME ${libName}
#EXPORT_MACRO_NAME ${libName}_EXPORT
- EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/${libName}_export.h
+ EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/${libName}_export.h
#STATIC_DEFINE ${libName}_BUILT_AS_STATIC
)
#endif()
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 9e0c89124..c8153cea3 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -165,8 +165,10 @@ function(vf_add_library)
MESSAGE(STATUS "configuring ${library_name} (type=${ARG_BUILDTYPE})... done")
if (NOT ${ARG_BUILDTYPE} MATCHES binary)
- generateExportHeader (${library_name})
- endif()
+ generateExportHeader (${library_name})
+ endif()
+
+ target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR})
endfunction(vf_add_library)
diff --git a/cpu/Applications/IncludsList.cmake b/cpu/Applications/IncludsList.cmake
index 811c04789..34feefc56 100644
--- a/cpu/Applications/IncludsList.cmake
+++ b/cpu/Applications/IncludsList.cmake
@@ -1,3 +1,13 @@
INCLUDE_DIRECTORIES(${APPS_ROOT})
-INCLUDE(${SOURCE_DIR}/VirtualFluidsBasic/IncludsList.cmake)
INCLUDE(${SOURCE_DIR}/VirtualFluidsCore/IncludsList.cmake)
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/writer)
\ No newline at end of file
diff --git a/cpu/VirtualFluidsCore/CMakeLists.txt b/cpu/VirtualFluidsCore/CMakeLists.txt
index 4c9736add..415006db7 100644
--- a/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -98,13 +98,13 @@ include (${CMAKE_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
vf_add_library(BUILDTYPE static DEPENDS basics MuParser ${MPI_LIBRARY})
vf_get_library_name(library_name)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/Creator)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/KdTree)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/container)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/memory)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/objects)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/transmiitter)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/utilities)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/writer)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/writer)
diff --git a/src/basics/basics/container/CbArray4D.h b/src/basics/basics/container/CbArray4D.h
index a26ede677..aa91844d0 100644
--- a/src/basics/basics/container/CbArray4D.h
+++ b/src/basics/basics/container/CbArray4D.h
@@ -32,7 +32,7 @@
#include <typeinfo>
#include "PointerDefinitions.h"
-#include "basics_export"
+#include "basics_export.h"
#ifdef CAB_RCF
#include <3rdParty/rcf/RcfSerializationIncludes.h>
--
GitLab