diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-27 17:29:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-27 17:29:22 (GMT) |
commit | fc9f31ad8c8ff4122e8bb2997e0a2bfa89cb054b (patch) | |
tree | 8c8c33c722ed8aefd3a738a77a03972249880cea /fortran/src/CMakeLists.txt | |
parent | a0a1959c58973095194f2d9ac5f9b13bb7b14fb4 (diff) | |
download | hdf5-fc9f31ad8c8ff4122e8bb2997e0a2bfa89cb054b.zip hdf5-fc9f31ad8c8ff4122e8bb2997e0a2bfa89cb054b.tar.gz hdf5-fc9f31ad8c8ff4122e8bb2997e0a2bfa89cb054b.tar.bz2 |
fortran module folder from GH#1411 #1922 (#1942)
Diffstat (limited to 'fortran/src/CMakeLists.txt')
-rw-r--r-- | fortran/src/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 316d3c7..0c84aa6 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -320,7 +320,7 @@ if (NOT ONLY_SHARED_LIBS) add_library (${HDF5_F90_LIB_TARGET} STATIC ${f90_F_SOURCES}) target_include_directories (${HDF5_F90_LIB_TARGET} PRIVATE "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>" - INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>" + INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/static>" ) target_compile_options(${HDF5_F90_LIB_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}") target_compile_definitions(${HDF5_F90_LIB_TARGET} @@ -354,7 +354,7 @@ if (BUILD_SHARED_LIBS) add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES_SHARED}) target_include_directories (${HDF5_F90_LIBSH_TARGET} PRIVATE "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>" - INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>" + INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${HDF5_INSTALL_MODULE_DIR}/shared>" ) target_compile_options(${HDF5_F90_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_Fortran_FLAGS}") target_compile_definitions(${HDF5_F90_LIBSH_TARGET} @@ -447,7 +447,7 @@ if (NOT ONLY_SHARED_LIBS) FILES ${mod_files} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/static + ${HDF5_INSTALL_MODULE_DIR}/static COMPONENT fortheaders ) @@ -490,7 +490,7 @@ if (BUILD_SHARED_LIBS) FILES ${modsh_files} DESTINATION - ${HDF5_INSTALL_INCLUDE_DIR}/shared + ${HDF5_INSTALL_MODULE_DIR}/shared COMPONENT fortheaders ) @@ -539,6 +539,7 @@ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) set (_PKG_CONFIG_EXEC_PREFIX \${prefix}) set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib) set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include) +set (_PKG_CONFIG_MODULEDIR \${prefix}/mod) set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}") set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") @@ -555,7 +556,7 @@ set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in + ${HDF_CONFIG_DIR}/libhdf5.fpc.in ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_F90_LIB_CORENAME}.pc @ONLY ) |