From: Jan Rękorajski Date: Sat, 13 Jul 2013 09:20:42 +0000 (+0200) Subject: - added libhdf5_hl to cmake configs X-Git-Tag: auto/th/hdf5-1.8.11-2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e1d24780de668ad350df1f89a5b3e6cce882e2fb;p=packages%2Fhdf5.git - added libhdf5_hl to cmake configs - rel 2 --- diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index bc22159..80577a8 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -1,6 +1,6 @@ --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in 2013-04-02 18:10:51.166052034 +0200 -@@ -0,0 +1,36 @@ +@@ -0,0 +1,39 @@ +# Generated by CMake 2.8.10.2 + +IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) @@ -18,6 +18,9 @@ +# Create imported target hdf5 +ADD_LIBRARY(hdf5 STATIC IMPORTED) + ++# Create imported target hdf5_hl ++ADD_LIBRARY(hdf5_hl STATIC IMPORTED) ++ +# Create imported target hdf5_f90cstub +ADD_LIBRARY(hdf5_f90cstub STATIC IMPORTED) + @@ -39,7 +42,7 @@ +CMAKE_POLICY(POP) --- hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in 2013-04-02 18:12:17.399383569 +0200 -@@ -0,0 +1,79 @@ +@@ -0,0 +1,93 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "". +#---------------------------------------------------------------- @@ -70,6 +73,20 @@ +# Make sure the targets which have been exported in some other +# export set exist. + ++# Import target "hdf5_hl" for configuration "" ++SET_PROPERTY(TARGET hdf5_hl APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) ++SET_TARGET_PROPERTIES(hdf5_hl PROPERTIES ++ IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C" ++ IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so" ++ ) ++ ++#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_hl ) ++LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_hl "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so" ) ++ ++# Make sure the targets which have been exported in some other ++# export set exist. ++ +# Import target "hdf5_fortran" for configuration "" +SET_PROPERTY(TARGET hdf5_fortran APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +SET_TARGET_PROPERTIES(hdf5_fortran PROPERTIES diff --git a/hdf5.spec b/hdf5.spec index 1484c02..5e69d47 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -10,7 +10,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.8.11 -Release: 1 +Release: 2 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2