From 649e6b865a016b08625b13eeb26403a102f85430 Mon Sep 17 00:00:00 2001
From: Stephan Schulz <stephan.schulz-x2q@rub.de>
Date: Tue, 26 Jan 2021 16:26:33 +0100
Subject: [PATCH] move fortran modules into lib directory
---
CHANGELOG.rst | 2 ++
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f53a29d..837bbe9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,8 @@ Version 0.9
Version 0.9.2
*************
+- *CHANGE*: Fortran modules are now installed in ``/lib``, instead of
+ ``/include/modules``.
- Feature: Integration tests are only generated if ``CM_ALL_TESTS_INTEGRATION``
is set.
- Feature: Example CMake and Make projects for integrating ALL into the build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e9214..b100eef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,7 +166,7 @@ file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_INCLUDE := -I\$(ALL_DIR)/include\n")
file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_LIB :=\n")
if(CM_ALL_FORTRAN)
file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_LIB += \$(ALL_DIR)/lib/libALL_fortran.a \$(ALL_DIR)/lib/libALL.a -lstdc++\n")
- file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_INCLUDE += -I\$(ALL_DIR)/include/modules\n")
+ file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_INCLUDE += -I\$(ALL_DIR)/lib\n")
endif()
if(CM_ALL_VORONOI)
file(APPEND ${ALL_MAKEFILE_INC} "LIBALL_LIB += \$(ALL_DIR)/lib/libvoro.a\n")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d7cf93..676a105 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ if (CM_ALL_FORTRAN)
target_include_directories(ALL_fortran
INTERFACE
"$<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>"
- "$<INSTALL_INTERFACE:include/modules>")
+ "$<INSTALL_INTERFACE:lib>")
target_link_libraries(ALL_fortran PUBLIC ${MPI_Fortran_LINK_FLAGS} ${MPI_Fortran_LIBRARIES})
target_link_libraries(ALL_fortran PUBLIC ALL)
@@ -65,7 +65,7 @@ if (CM_ALL_FORTRAN)
ARCHIVE DESTINATION lib
INCLUDES DESTINATION include)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/modules DESTINATION include)
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/modules/ DESTINATION lib)
endif(CM_ALL_FORTRAN)
add_executable(Amalgamate Amalgamate.c)
--
GitLab