HDFFV-10385 fix packaging

This commit is contained in:
Allen Byrne 2018-01-10 13:31:47 -06:00
parent 5b4b465832
commit 681047269b
3 changed files with 6 additions and 6 deletions

View File

@ -66,10 +66,10 @@ set_target_properties (H5_buildiface PROPERTIES
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared") file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE}) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
endif () endif ()
file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static") file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE}) set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY}) INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})

View File

@ -34,10 +34,10 @@ set_target_properties (H5_test_buildiface PROPERTIES
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared") file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE}) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
endif () endif ()
file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static") file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE}) set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add Test Lib # Add Test Lib

View File

@ -38,10 +38,10 @@ set_target_properties (H5HL_buildiface PROPERTIES
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/shared") file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/shared")
set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE}) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
endif () endif ()
file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/static") file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/static")
set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE}) set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup include Directories # Setup include Directories