Add patch for hdf5 library detection.

This commit is contained in:
Richard M. Shaw 2013-08-29 09:21:42 -05:00
parent c2eb3276a8
commit 39a295a4ce
2 changed files with 14 additions and 0 deletions

View File

@ -15,6 +15,7 @@ Source101: FindTBB.cmake
Patch0: oiio-arm.patch
Patch1: oiio-ppc.patch
Patch2: oiio-s390.patch
Patch3: oiio-hdf5.patch
BuildRequires: cmake txt2man
BuildRequires: qt4-devel
@ -80,6 +81,7 @@ Development files for package %{name}
%patch0 -p1 -b .arm
%patch1 -p1 -b .ppc
#patch2 -p1 -b .s390
%patch3 -p1 -b .hdf5
# Install FindTBB.cmake
install %{SOURCE101} src/cmake/modules/
@ -111,6 +113,7 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux
%ifarch ppc ppc64
-DNOTHREADS:BOOL=TRUE \
%endif
-DVERBOSE=TRUE \
../../src
make %{?_smp_mflags}

11
oiio-hdf5.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Naur oiio-Release-1.2.1.orig/src/cmake/externalpackages.cmake oiio-Release-1.2.1/src/cmake/externalpackages.cmake
--- oiio-Release-1.2.1.orig/src/cmake/externalpackages.cmake 2013-08-06 00:10:31.000000000 -0500
+++ oiio-Release-1.2.1/src/cmake/externalpackages.cmake 2013-08-29 09:12:03.303106159 -0500
@@ -285,6 +285,7 @@
# variables HDF5_INCLUDE_DIRS and HDF5_LIBRARIES.
else ()
find_package (HDF5 COMPONENTS CXX)
+ set(HDF5_LIBRARIES ${HDF5_LIBRARIES_RELEASE})
endif ()
if (VERBOSE)
message (STATUS "HDF5_FOUND=${HDF5_FOUND}")