summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-05-27 17:54:24 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-05-27 17:54:24 (GMT)
commit006aa8245212decdc7f9b6d25283e409502c3b1a (patch)
tree3f2c58ea825e407971e485bf8b01409470ca1796 /hl
parent652a1c649fdeef870fb8b1b3d0d00bb29c0ca511 (diff)
downloadhdf5-006aa8245212decdc7f9b6d25283e409502c3b1a.zip
hdf5-006aa8245212decdc7f9b6d25283e409502c3b1a.tar.gz
hdf5-006aa8245212decdc7f9b6d25283e409502c3b1a.tar.bz2
[svn-r18914] Added fortran library to list of library links.
Tested: Windows, local linux
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/CMakeLists.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index da9cde8..71302f3 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -4,14 +4,14 @@ PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
#-----------------------------------------------------------------------------
# Setup include Directories
#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR})
-INCLUDE_DIRECTORIES (${HDF5_F90_SRC_BINARY_DIR})
-
-INCLUDE_DIRECTORIES (${HDF5_HL_F90_SRC_SOURCE_DIR})
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src)
-
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (
+ ${CMAKE_Fortran_MODULE_DIRECTORY}
+ ${HDF5_F90_BINARY_DIR}
+ ${HDF5_F90_SOURCE_DIR}/src
+ ${HDF5_F90_SRC_BINARY_DIR}
+ ${HDF5_HL_F90_SRC_SOURCE_DIR}
+ ${HDF5_HL_SOURCE_DIR}/src
+)
LINK_DIRECTORIES (
${CMAKE_Fortran_MODULE_DIRECTORY}
${HDF5_HL_F90_BINARY_DIR}
@@ -43,7 +43,6 @@ TARGET_LINK_LIBRARIES (${HDF5_HL_F90_C_LIB_TARGET}
)
#
# To Ensure that generated files are built, we must force a dependency
-#
ADD_DEPENDENCIES(${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET})
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT
@@ -79,6 +78,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT
)
TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET}
${HDF5_HL_F90_C_LIB_TARGET}
+ ${HDF5_F90_LIB_TARGET}
)
H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE})
ADD_DEPENDENCIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET})