Skip to content

Commit 88adb9f

Browse files
authored
Merge pull request #419 from awvwgk/cmake
Allow modification of install directory for module files
2 parents f92ba28 + c85fa99 commit 88adb9f

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

config/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# SPDX-Identifier: MIT
22

3+
option(
4+
CMAKE_INSTALL_MODULEDIR
5+
"Directory in prefix to install generated module files"
6+
"${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}"
7+
)
8+
39
# Export a pkg-config file
410
configure_file(
511
"${CMAKE_CURRENT_SOURCE_DIR}/template.pc"

config/template.pc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
22
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
33
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
4+
moduledir=${prefix}/@CMAKE_INSTALL_MODULEDIR@
45

56
Name: @PROJECT_NAME@
67
Description: @PROJECT_DESCRIPTION@
78
Version: @PROJECT_VERSION@
89
Libs: -L${libdir} -l@PROJECT_NAME@
9-
Cflags: -I${includedir}
10+
Cflags: -I${includedir} -I${moduledir}

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5959
Fortran_MODULE_DIRECTORY ${LIB_MOD_DIR})
6060
target_include_directories(${PROJECT_NAME} PUBLIC
6161
$<BUILD_INTERFACE:${LIB_MOD_DIR}>
62-
$<INSTALL_INTERFACE:include>
62+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_MODULEDIR}>
6363
)
6464

6565
if(f18errorstop)
@@ -76,4 +76,4 @@ install(TARGETS ${PROJECT_NAME}
7676
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
7777
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
7878
)
79-
install(DIRECTORY ${LIB_MOD_DIR} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
79+
install(DIRECTORY ${LIB_MOD_DIR} DESTINATION "${CMAKE_INSTALL_MODULEDIR}")

0 commit comments

Comments
 (0)