[InsightToolkit] Explicitly set doc dir in cmake invocation. Removed check section for quicker tests. Still no vtk mo
mrceresa
mrceresa at fedoraproject.org
Tue Aug 13 15:37:43 UTC 2013
commit 9d8f69dca7b9678209bd6295a5f6437d689f0e42
Author: Mario Ceresa <mario.ceresa at alma3d.com>
Date: Tue Aug 13 17:37:29 2013 +0200
Explicitly set doc dir in cmake invocation. Removed check section for quicker tests. Still no vtk module
InsightToolkit.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/InsightToolkit.spec b/InsightToolkit.spec
index 8fad139..09776f0 100644
--- a/InsightToolkit.spec
+++ b/InsightToolkit.spec
@@ -112,7 +112,7 @@ pushd %{_target_platform}
-DBUILD_EXAMPLES:BOOL=ON \
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo"\
-DCMAKE_VERBOSE_MAKEFILE=ON\
- -DBUILD_TESTING=ON\
+ -DBUILD_TESTING=OFF\
-DITKV3_COMPATIBILITY:BOOL=ON \
-DITK_BUILD_ALL_MODULES:BOOL=ON \
-DModule_ITKVtkGlue:BOOL=OFF \
@@ -133,7 +133,7 @@ pushd %{_target_platform}
-DITK_INSTALL_INCLUDE_DIR=include/%{name} \
-DITK_INSTALL_PACKAGE_DIR=%{_lib}/cmake/%{name}/ \
-DITK_INSTALL_RUNTIME_DIR:PATH=%{_bindir} \
- -DITK_INSTALL_DOC_DIR=doc/%{name}/ \
+ -DITK_INSTALL_DOC_DIR=share/doc/%{name}/ \
-DCMAKE_CXX_FLAGS:STRING="-fpermissive"
popd
@@ -150,7 +150,8 @@ cp -ar Examples/* %{buildroot}%{_datadir}/%{name}/examples/
%check
# There are a couple of tests randomly failing on f19 and rawhide and I'm debugging
# it with upstream. Making the tests informative for now
-make test -C %{_target_platform} || exit 0
+#make test -C %{_target_platform} || exit 0
+exit 0
%post -p /sbin/ldconfig
@@ -160,8 +161,6 @@ make test -C %{_target_platform} || exit 0
%dir %{_datadir}/%{name}
%{_libdir}/*.so.*
%{_bindir}/itkTestDriver
-%doc LICENSE README.txt NOTICE
-
%files devel
%{_libdir}/*.so
@@ -172,9 +171,9 @@ make test -C %{_target_platform} || exit 0
%files examples
%{_datadir}/%{name}/examples
-
%files doc
-%{_docdir}/%{name}/
+%dir %{_docdir}/%{name}/
+%{_docdir}/%{name}/*
%doc ItkSoftwareGuide-2.4.0.pdf
More information about the scm-commits
mailing list