From 4751d485dfb01fef33de2dbfb4729ac6ee58fe6d Mon Sep 17 00:00:00 2001
From: Stephan Schulz <stephan.schulz-x2q@rub.de>
Date: Mon, 18 Jan 2021 17:25:05 +0100
Subject: [PATCH] update includes for package
---
src/CMakeLists.txt | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f081244..056541a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,15 +1,16 @@
set(ALL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
set(ALL_HEADER_FILES
- ${ALL_INCLUDE_DIR}/ALL.hpp
- ${ALL_INCLUDE_DIR}/ALL_LB.hpp
+ ${ALL_INCLUDE_DIR}/ALL_CustomExceptions.hpp
+ ${ALL_INCLUDE_DIR}/ALL_Defines.h
+ ${ALL_INCLUDE_DIR}/ALL_ForceBased.hpp
${ALL_INCLUDE_DIR}/ALL_Functions.hpp
${ALL_INCLUDE_DIR}/ALL_Histogram.hpp
+ ${ALL_INCLUDE_DIR}/ALL.hpp
+ ${ALL_INCLUDE_DIR}/ALL_LB.hpp
+ ${ALL_INCLUDE_DIR}/ALL_Point.hpp
${ALL_INCLUDE_DIR}/ALL_Staggered.hpp
${ALL_INCLUDE_DIR}/ALL_Tensor.hpp
- ${ALL_INCLUDE_DIR}/ALL_ForceBased.hpp
- ${ALL_INCLUDE_DIR}/ALL_Voronoi.hpp
- ${ALL_INCLUDE_DIR}/ALL_Point.hpp
- ${ALL_INCLUDE_DIR}/ALL_CustomExceptions.hpp)
+ ${ALL_INCLUDE_DIR}/ALL_Voronoi.hpp)
# todo(s.schulz): Should these be installed explicitly?
# install(FILES ${ALL_HEADER_FILES} DESTINATION include)
@@ -59,8 +60,8 @@ if (CM_ALL_FORTRAN)
target_include_directories(ALL_fortran PUBLIC ${MPI_Fortran_INCLUDE_PATH})
target_include_directories(ALL_fortran
PUBLIC
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
- "$<INSTALL_INTERFACE:src>")
+ "$<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>"
+ "$<INSTALL_INTERFACE:include/modules>")
target_include_directories(ALL_fortran PRIVATE ${ALL_INCLUDE_DIR})
target_link_libraries(ALL_fortran PUBLIC ${MPI_Fortran_LINK_FLAGS} ${MPI_Fortran_LIBRARIES} ALL)
--
GitLab