diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-05-14 17:19:56 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-05-14 17:19:56 (GMT) |
| commit | a4eb58bc332f72a9cfdb6a0625adac14f811243b (patch) | |
| tree | 48bcf3f44b444b5a3f3847191cbff45de5de8d0b /fortran | |
| parent | 306a2e07e15b7d30dc4d3e4d68f4d4438abd370f (diff) | |
| download | hdf5-a4eb58bc332f72a9cfdb6a0625adac14f811243b.zip hdf5-a4eb58bc332f72a9cfdb6a0625adac14f811243b.tar.gz hdf5-a4eb58bc332f72a9cfdb6a0625adac14f811243b.tar.bz2 | |
[svn-r22361] Change library source properties: remove "LANGUAGE C" property from headers. Add "LINKER C" property to link.
Tested: local linux
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 3d1c127..cecbfb6 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -84,9 +84,6 @@ ADD_CUSTOM_COMMAND ( # f90CStub lib #----------------------------------------------------------------------------- SET (f90CStub_C_SRCS - # generated files - ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h - # normal distribution ${HDF5_F90_SRC_SOURCE_DIR}/H5f90kit.c ${HDF5_F90_SRC_SOURCE_DIR}/H5_f.c @@ -114,11 +111,17 @@ ENDIF (H5_HAVE_PARALLEL) SET_SOURCE_FILES_PROPERTIES (${f90CStub_C_SRCS} PROPERTIES LANGUAGE C) -ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} ${f90CStub_C_SRCS}) +SET (f90CStub_C_HDRS + # generated files + ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h +) + +ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} ${f90CStub_C_SRCS} ${f90CStub_C_HDRS}) TARGET_LINK_LIBRARIES (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS}) SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE}) SET_TARGET_PROPERTIES (${HDF5_F90_C_LIB_TARGET} PROPERTIES FOLDER libraries/fortran) +SET_TARGET_PROPERTIES (${HDF5_F90_C_LIB_TARGET} PROPERTIES LINKER_LANGUAGE C) #----------------------------------------------------------------------------- # Fortran 2003 standard |