File tree 3 files changed +7
-17
lines changed
3 files changed +7
-17
lines changed Original file line number Diff line number Diff line change @@ -6,18 +6,8 @@ option(BUILD_SHARED_LIBS "Whether the library should be a shared one" FALSE)
6
6
7
7
option (INSTALL_INCLUDE_FILES "Whether include / module files should be installed" TRUE )
8
8
9
- set (INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX} /bin" CACHE PATH
10
- "Installation directory for executables" )
11
-
12
- set (INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX} /lib" CACHE PATH
13
- "Installation directory for libraries" )
14
-
15
- set (INSTALL_MOD_DIR "${CMAKE_INSTALL_PREFIX} /include/dftd3" CACHE PATH
16
- "Installation directory for Fortran module files" )
17
-
18
- set (INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX} /lib/cmake" CACHE PATH
19
- "Installation directory for CMake package export files" )
20
-
9
+ set (INSTALL_MODDIR "dftd3/modfiles" CACHE PATH
10
+ "Installation directory for Fortran module files (within standard include folder)" )
21
11
22
12
add_subdirectory (lib)
23
13
if (NOT LIBRARY_ONLY)
Original file line number Diff line number Diff line change @@ -13,14 +13,14 @@ set_target_properties(dftd3 PROPERTIES Fortran_MODULE_DIRECTORY ${includedir})
13
13
14
14
target_include_directories (dftd3 PUBLIC
15
15
$<BUILD_INTERFACE:${includedir} >
16
- $<INSTALL_INTERFACE:${INSTALL_MOD_DIR } >)
16
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} / ${INSTALL_MODDIR } >)
17
17
18
18
install (TARGETS dftd3
19
19
EXPORT ${INSTALL_EXPORT_NAME}
20
- ARCHIVE DESTINATION ${INSTALL_LIB_DIR }
21
- LIBRARY DESTINATION ${INSTALL_LIB_DIR } )
20
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR }
21
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR } )
22
22
23
23
if (INSTALL_INCLUDE_FILES)
24
- install (DIRECTORY ${includedir} / DESTINATION ${INSTALL_MOD_DIR } )
24
+ install (DIRECTORY ${includedir} / DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} / ${INSTALL_MODDIR } )
25
25
endif ()
26
26
Original file line number Diff line number Diff line change @@ -9,4 +9,4 @@ target_link_libraries(dftd3_standalone dftd3)
9
9
set_target_properties (dftd3_standalone PROPERTIES OUTPUT_NAME "dftd3" )
10
10
11
11
install (TARGETS dftd3_standalone
12
- RUNTIME DESTINATION ${INSTALL_BIN_DIR } )
12
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR } )
You can’t perform that action at this time.
0 commit comments