[med-svn] [Git][med-team/fast][master] 2 commits: Move over openigtlink binaries
Shayan Doust
gitlab at salsa.debian.org
Fri Aug 16 16:12:30 BST 2019
Shayan Doust pushed to branch master at Debian Med / fast
Commits:
dfb05dc5 by Shayan Doust at 2019-08-16T01:42:53Z
Move over openigtlink binaries
- - - - -
91ffc6e7 by Shayan Doust at 2019-08-16T02:06:36Z
Allow cmake to build examples.
We can split this off into fast-examples
- - - - -
3 changed files:
- debian/patches/fix_source_openigtlink.patch
- debian/patches/set_cmake_options.patch
- debian/rules
Changes:
=====================================
debian/patches/fix_source_openigtlink.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-08-08
Index: fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp
===================================================================
---- fast.orig/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-11 12:39:37.573218562 +0100
-+++ fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-11 12:39:37.565218493 +0100
+--- fast.orig/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-16 00:53:40.537030532 +0100
++++ fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp 2019-08-16 00:53:40.525030468 +0100
@@ -1,14 +1,14 @@
#include "OpenIGTLinkStreamer.hpp"
#include "FAST/Data/Image.hpp"
@@ -33,8 +33,8 @@ Index: fast/source/FAST/Streamers/OpenIGTLinkStreamer.cpp
namespace fast {
Index: fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp
===================================================================
---- fast.orig/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-11 12:39:37.573218562 +0100
-+++ fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-11 12:39:37.565218493 +0100
+--- fast.orig/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-16 00:53:40.537030532 +0100
++++ fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp 2019-08-16 00:53:40.525030468 +0100
@@ -1,9 +1,9 @@
#include "DummyIGTLServer.hpp"
@@ -51,8 +51,8 @@ Index: fast/source/FAST/Streamers/Tests/DummyIGTLServer.cpp
Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-11 12:39:37.573218562 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-11 12:39:37.565218493 +0100
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-16 00:53:40.537030532 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp 2019-08-16 00:53:40.529030489 +0100
@@ -7,9 +7,9 @@
#include <QMessageBox>
#include <QListWidget>
@@ -75,21 +75,30 @@ Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.cpp
+}
Index: fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-11 12:39:37.573218562 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-11 12:39:37.569218527 +0100
-@@ -2,7 +2,7 @@
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-16 00:53:40.537030532 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/GUI.hpp 2019-08-16 00:54:32.789310223 +0100
+@@ -1,8 +1,8 @@
+ #ifndef FAST_OPENIGTLINKSERVER_GUI_HPP_
#define FAST_OPENIGTLINKSERVER_GUI_HPP_
- #include "FAST/Visualization/Window.hpp"
+-#include "FAST/Visualization/Window.hpp"
-#include <igtl/igtlServerSocket.h>
++#include <FAST/Visualization/Window.hpp>
+#include <openigtlink/igtlServerSocket.h>
#include <thread>
Index: fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp
===================================================================
---- fast.orig/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-11 12:39:37.573218562 +0100
-+++ fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-11 12:39:37.569218527 +0100
+--- fast.orig/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-16 00:53:40.537030532 +0100
++++ fast/source/FAST/Tools/OpenIGTLinkServer/main.cpp 2019-08-16 00:54:48.541394547 +0100
+@@ -1,5 +1,5 @@
+ #include <FAST/Tools/CommandLineParser.hpp>
+-#include "FAST/Streamers/Tests/DummyIGTLServer.hpp"
++#include <FAST/Streamers/Tests/DummyIGTLServer.hpp>
+ #include "GUI.hpp"
+
+ using namespace fast;
@@ -23,4 +23,4 @@
Reporter::setGlobalReportMethod(Reporter::COUT);
window->getReporter().setReportMethod(Reporter::COUT);
=====================================
debian/patches/set_cmake_options.patch
=====================================
@@ -6,11 +6,14 @@ Last-Update: 2019-08-08
Index: fast/CMakeLists.txt
===================================================================
---- fast.orig/CMakeLists.txt 2019-08-14 12:16:10.787472253 +0100
-+++ fast/CMakeLists.txt 2019-08-14 12:16:39.072304964 +0100
-@@ -18,7 +18,7 @@
+--- fast.orig/CMakeLists.txt 2019-08-16 02:43:32.888319227 +0100
++++ fast/CMakeLists.txt 2019-08-16 02:43:41.820367044 +0100
+@@ -16,9 +16,9 @@
+
+ #### Options
option(FAST_BUILD_TESTS "Build FAST tests." ON)
- option(FAST_BUILD_EXAMPLES "Build examples." OFF)
+-option(FAST_BUILD_EXAMPLES "Build examples." OFF)
++option(FAST_BUILD_EXAMPLES "Build examples." ON)
option(FAST_BUILD_TOOLS "Build tools." ON)
-option(FAST_BUILD_DOCS "Build API documentation" OFF)
+option(FAST_BUILD_DOCS "Build API documentation" ON)
=====================================
debian/rules
=====================================
@@ -23,4 +23,6 @@ override_dh_install:
mv debian/fast/usr/fast/kernels debian/fast/usr/lib/fast
mv debian/fast/usr/fast/include/FAST/* debian/fast/usr/include/FAST
mv debian/fast/usr/fast/include/FASTExport.hpp debian/fast/usr/include
+ mv debian/fast/usr/fast/bin/OpenIGTLinkServer debian/fast/usr/lib/fast
+ mv debian/fast/usr/fast/bin/OpenIGTLinkClient debian/fast/usr/lib/fast
rm -r debian/fast/usr/fast
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/a26e2b4075a7c00d4c442224845a78f1d4943ae3...91ffc6e77c5237b90cef317175dc041d041677f0
--
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/a26e2b4075a7c00d4c442224845a78f1d4943ae3...91ffc6e77c5237b90cef317175dc041d041677f0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190816/40e874af/attachment-0001.html>
More information about the debian-med-commit
mailing list