Update to 6.1.0

Fix cmake build
This commit is contained in:
Luya Tshimbalanga 2019-08-03 23:43:28 -07:00
parent 2d19ad2046
commit a7c3c2a151
No known key found for this signature in database
GPG Key ID: 5E528174D8A2609A

View File

@ -108,16 +108,20 @@ mkdir build
%build %build
pushd build pushd build
export CXXFLAGS="%{optflags} -Wl,--as-needed" export CXXFLAGS="%{optflags} -Wl,--as-needed"
# Versioning on ilmbase is broken, using workaround
# https://www.openvdb.org/documentation/doxygen/build.html#buildTroubleshooting
%cmake \ %cmake \
-DBLOSC_LOCATION=%{_prefix} \ -DBLOSC_LOCATION=%{_prefix} \
-DCMAKE_EXE_LINKER_FLAGS="%{optflags} -fPIE" \ -DCMAKE_EXE_LINKER_FLAGS="%{optflags} -fPIE" \
-DCPPUNIT_LOCATION=%{_prefix} \ -DCPPUNIT_LOCATION=%{_prefix} \
-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \
-DGLEW_LOCATION=%{_prefix} \ -DGLEW_LOCATION=%{_prefix} \
-DGLFW3_LOCATION=%{_prefix} \ -DGLFW3_LOCATION=%{_prefix} \
-DILMBASE_NAMESPACE_VERSIONING=ON \ -DILMBASE_NAMESPACE_VERSIONING=OFF \
-DILMBASE_LOCATION=%{_prefix} \ -DILMBASE_LOCATION=%{_prefix} \
-DOPENEXR_LOCATION=%{_prefix} \ -DOPENEXR_LOCATION=%{_prefix} \
-DOPENEXR_NAMESPACE_VERSIONING=ON \ -DOPENEXR_NAMESPACE_VERSIONING=OFF \
-DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \
-DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_BUILD_UNITTESTS=OFF \
-DPYTHON_VERSION=%{python_version} \ -DPYTHON_VERSION=%{python_version} \
@ -125,8 +129,8 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed"
-DTBB_LOCATION=%{_prefix} \ -DTBB_LOCATION=%{_prefix} \
-DUSE_GLFW3=True \ -DUSE_GLFW3=True \
.. ..
popd
%make_build %make_build
popd
# Build docs with previously saved Makefile # Build docs with previously saved Makefile
pushd %{name} pushd %{name}