Set VTK_INSTALL_ARCHIVE_DIR for proper install location for libvtkWrappingTools.a

This commit is contained in:
Orion Poplawski 2013-07-01 09:33:55 -06:00
parent 00efa13061
commit 354ba92a1d
1 changed files with 4 additions and 2 deletions

View File

@ -191,6 +191,7 @@ pushd build
-DBUILD_EXAMPLES:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/vtk \
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \ -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/vtk \
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \ -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \
@ -246,9 +247,10 @@ mkdir -p %{buildroot}
pushd build pushd build
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# Move python libraries into the proper location
if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then
mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_libdir}
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/ mv %{buildroot}%{_prefix}/lib/python* %{buildroot}%{_libdir}/
fi fi
# ld config # ld config
@ -381,7 +383,7 @@ cp -pr --parents Wrapping/*/README* _docs/
%{_bindir}/vtkWrapHierarchy %{_bindir}/vtkWrapHierarchy
%{_includedir}/vtk %{_includedir}/vtk
%{_libdir}/vtk/*.so %{_libdir}/vtk/*.so
%{_libdir}/libvtkWrappingTools.a %{_libdir}/vtk/libvtkWrappingTools.a
%{_libdir}/cmake/vtk/ %{_libdir}/cmake/vtk/
%{_bindir}/vtkParseOGLExt %{_bindir}/vtkParseOGLExt
%{_bindir}/vtkProcessShader %{_bindir}/vtkProcessShader