Skip to content

Commit 3143a36

Browse files
asiangoldfishasiangoldfish
committed
[WIP][packages/openigtlink] Patch missing headerfiles
1 parent 5545377 commit 3143a36

File tree

2 files changed

+253
-13
lines changed

2 files changed

+253
-13
lines changed

‎guix-systole/packages/patches/0019-COMP-packages-slicer-Port-OpenIGTLinkIF-to-slicer.patch

Lines changed: 251 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 910c39c..13100b3 100644
2+
index 910c39c..74bb47d 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -17,8 +17,9 @@ set(SUPERBUILD_TOPLEVEL_PROJECT inner)
5+
@@ -17,10 +17,26 @@ set(SUPERBUILD_TOPLEVEL_PROJECT inner)
66

77
#-----------------------------------------------------------------------------
88
# Extension dependencies
@@ -13,8 +13,25 @@ index 910c39c..13100b3 100644
1313
+include(SlicerMacroBuildLoadableModule)
1414
mark_as_superbuild(Slicer_DIR)
1515

16+
+find_package(DCMTK REQUIRED
17+
+ COMPONENTS
18+
+ ofstd
19+
+ oflog
20+
+ dcmdata
21+
+ i2d
22+
+ dcmimgle
23+
+ dcmimage
24+
+ dcmjpeg
25+
+ ijg8
26+
+ ijg12
27+
+ ijg16
28+
+ dcmjpls
29+
+ )
30+
+
1631
#-----------------------------------------------------------------------------
17-
@@ -28,19 +29,21 @@ mark_as_superbuild(SlicerOpenIGTLink_USE_VP9)
32+
# Options
33+
option(SlicerOpenIGTLink_USE_VP9 "Build SlicerOpenIGTLink with VP9 support" OFF)
34+
@@ -28,19 +44,21 @@ mark_as_superbuild(SlicerOpenIGTLink_USE_VP9)
1835

1936
#-----------------------------------------------------------------------------
2037
# SuperBuild setup
@@ -43,7 +60,7 @@ index 910c39c..13100b3 100644
4360
## NEXT_MODULE
4461

4562
#-----------------------------------------------------------------------------
46-
@@ -50,7 +53,8 @@ set(SlicerOpenIGTLink_CUSTOM_CONFIG "
63+
@@ -50,7 +68,8 @@ set(SlicerOpenIGTLink_CUSTOM_CONFIG "
4764
include(\"${OpenIGTLink_DIR}/OpenIGTLinkConfig.cmake\")
4865
include(\"${OpenIGTLinkIO_DIR}/OpenIGTLinkIOConfig.cmake\")
4966
")
@@ -53,21 +70,242 @@ index 910c39c..13100b3 100644
5370

5471
#-----------------------------------------------------------------------------
5572
# Packaging
56-
@@ -61,4 +65,4 @@ set(${EXTENSION_NAME}_CPACK_INSTALL_CMAKE_PROJECTS "${EXTENSION_CPACK_INSTALL_CM
73+
@@ -61,4 +80,4 @@ set(${EXTENSION_NAME}_CPACK_INSTALL_CMAKE_PROJECTS "${EXTENSION_CPACK_INSTALL_CM
5774
list(APPEND CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};${EXTENSION_NAME};ALL;/")
5875
list(APPEND CPACK_INSTALL_CMAKE_PROJECTS "${${EXTENSION_NAME}_CPACK_INSTALL_CMAKE_PROJECTS}")
5976
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/SlicerBlockInstallVP9.cmake)
6077
-include(${Slicer_EXTENSION_CPACK})
6178
+#include(${Slicer_EXTENSION_CPACK})
62-
diff --git a/OpenIGTLinkIF/CMakeLists.txt b/OpenIGTLinkIF/CMakeLists.txt
63-
index 716487f..b7ad1b0 100644
64-
--- a/OpenIGTLinkIF/CMakeLists.txt
65-
+++ b/OpenIGTLinkIF/CMakeLists.txt
66-
@@ -73,6 +73,7 @@ set(MODULE_TARGET_LIBRARIES
67-
vtkSlicerOpenIGTLinkIFModuleMRML
68-
qSlicerOpenIGTLinkIFModuleWidgets
79+
diff --git a/OpenIGTLinkIF/Logic/CMakeLists.txt b/OpenIGTLinkIF/Logic/CMakeLists.txt
80+
index 954aa20..866920a 100644
81+
--- a/OpenIGTLinkIF/Logic/CMakeLists.txt
82+
+++ b/OpenIGTLinkIF/Logic/CMakeLists.txt
83+
@@ -8,6 +8,7 @@ set(${KIT}_INCLUDE_DIRECTORIES
84+
${vtkSlicerOpenIGTLinkIFModuleMRML_SOURCE_DIR}
85+
${vtkSlicerOpenIGTLinkIFModuleMRML_BINARY_DIR}
86+
${OpenIGTLinkIO_INCLUDE_DIRS}
87+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerColorsModuleLogic
88+
)
89+
90+
set(${KIT}_SRCS
91+
@@ -21,6 +22,7 @@ set(${KIT}_TARGET_LIBRARIES
92+
${OpenIGTLinkIO_LIBRARIES}
93+
${VTK_LIBRARIES}
94+
${ITK_LIBRARIES}
95+
+ DCMTK
96+
)
97+
98+
if (Slicer_VERSION VERSION_LESS "4.11.0")
99+
diff --git a/OpenIGTLinkIF/MRML/CMakeLists.txt b/OpenIGTLinkIF/MRML/CMakeLists.txt
100+
index 35389e8..fe66e28 100644
101+
--- a/OpenIGTLinkIF/MRML/CMakeLists.txt
102+
+++ b/OpenIGTLinkIF/MRML/CMakeLists.txt
103+
@@ -10,6 +10,7 @@ set(${KIT}_INCLUDE_DIRECTORIES
104+
${CMAKE_CURRENT_SOURCE_DIR}/../Logic
105+
${CMAKE_CURRENT_BINARY_DIR}/../Logic
106+
${OpenIGTLinkIO_INCLUDE_DIRS}
107+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerMarkupsModuleMRML
108+
)
109+
110+
set(${KIT}_SRCS
111+
@@ -43,8 +44,12 @@ set(${KIT}_TARGET_LIBRARIES
112+
vtkSlicerAnnotationsModuleMRML
113+
vtkSlicerMarkupsModuleMRML
114+
qSlicerBaseQTGUI
115+
+ ${Slicer_Base_LIBRARIES}
116+
+ ${CTK_LIBRARIES}
117+
)
118+
119+
+link_directories(${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR})
120+
+
121+
#-----------------------------------------------------------------------------
122+
SlicerMacroBuildModuleMRML(
123+
NAME ${KIT}
124+
diff --git a/OpenIGTLinkIF/Widgets/CMakeLists.txt b/OpenIGTLinkIF/Widgets/CMakeLists.txt
125+
index 7e2deb0..9533eda 100644
126+
--- a/OpenIGTLinkIF/Widgets/CMakeLists.txt
127+
+++ b/OpenIGTLinkIF/Widgets/CMakeLists.txt
128+
@@ -52,6 +52,7 @@ set(${KIT}_TARGET_LIBRARIES
69129
${MRML_LIBRARIES}
70-
+ vtkSlicerMarkupsModuleMRML
130+
vtkSlicerOpenIGTLinkIFModuleLogic
131+
vtkSlicerOpenIGTLinkIFModuleMRML
132+
+ qMRMLWidgets
133+
)
134+
135+
#-----------------------------------------------------------------------------
136+
diff --git a/OpenIGTLinkRemote/CMakeLists.txt b/OpenIGTLinkRemote/CMakeLists.txt
137+
index 6752e7e..64541a7 100644
138+
--- a/OpenIGTLinkRemote/CMakeLists.txt
139+
+++ b/OpenIGTLinkRemote/CMakeLists.txt
140+
@@ -35,12 +35,15 @@ set(MODULE_MOC_SRCS
141+
set(MODULE_TARGET_LIBRARIES
142+
vtkSlicer${MODULE_NAME}ModuleLogic
143+
qSlicer${MODULE_NAME}ModuleWidgets
144+
+ DCMTK
71145
)
72146

73147
set(MODULE_RESOURCES
148+
Resources/qSlicer${MODULE_NAME}Module.qrc
149+
)
150+
151+
+link_directories(${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR})
152+
+
153+
#-----------------------------------------------------------------------------
154+
slicerMacroBuildQtModule(
155+
NAME ${MODULE_NAME}
156+
diff --git a/OpenIGTLinkRemote/MRML/CMakeLists.txt b/OpenIGTLinkRemote/MRML/CMakeLists.txt
157+
index 68eebf5..96bbb57 100644
158+
--- a/OpenIGTLinkRemote/MRML/CMakeLists.txt
159+
+++ b/OpenIGTLinkRemote/MRML/CMakeLists.txt
160+
@@ -25,6 +25,8 @@ LIST(APPEND ${KIT}_TARGET_LIBRARIES
161+
${MRML_LIBRARIES}
162+
)
163+
164+
+link_directories(${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR})
165+
+
166+
#-----------------------------------------------------------------------------
167+
SlicerMacroBuildModuleMRML(
168+
NAME ${KIT}
169+
diff --git a/OpenIGTLinkRemote/Widgets/CMakeLists.txt b/OpenIGTLinkRemote/Widgets/CMakeLists.txt
170+
index e761c6a..b725166 100644
171+
--- a/OpenIGTLinkRemote/Widgets/CMakeLists.txt
172+
+++ b/OpenIGTLinkRemote/Widgets/CMakeLists.txt
173+
@@ -6,6 +6,7 @@ set(${KIT}_EXPORT_DIRECTIVE "Q_SLICER_QTMODULES_${MODULE_NAME_UPPER}_WIDGETS_EXP
174+
175+
set(${KIT}_INCLUDE_DIRECTORIES
176+
${CMAKE_BUILD_DIR}
177+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerAnnotationsModuleMRML
178+
)
179+
180+
set(${KIT}_SRCS
181+
@@ -35,6 +36,7 @@ set(${KIT}_RESOURCES
182+
183+
set(${KIT}_TARGET_LIBRARIES
184+
vtkSlicer${MODULE_NAME}ModuleLogic
185+
+ qMRMLWidgets
186+
)
187+
188+
#-----------------------------------------------------------------------------
189+
diff --git a/PlusRemote/CMakeLists.txt b/PlusRemote/CMakeLists.txt
190+
index bf87700..1995cb5 100644
191+
--- a/PlusRemote/CMakeLists.txt
192+
+++ b/PlusRemote/CMakeLists.txt
193+
@@ -1,3 +1,5 @@
194+
+find_package(Qt5 REQUIRED COMPONENTS Multimedia)
195+
+
196+
#-----------------------------------------------------------------------------
197+
set(MODULE_NAME PlusRemote)
198+
string(TOUPPER ${MODULE_NAME} MODULE_NAME_UPPER)
199+
@@ -18,6 +20,8 @@ set(MODULE_INCLUDE_DIRECTORIES
200+
${CMAKE_CURRENT_BINARY_DIR}/Logic
201+
${CMAKE_CURRENT_SOURCE_DIR}/Widgets
202+
${CMAKE_CURRENT_BINARY_DIR}/Widgets
203+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerAnnotationsModuleMRML
204+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerMarkupsModuleMRML
205+
)
206+
207+
set(MODULE_SRCS
208+
@@ -46,6 +50,8 @@ set(MODULE_TARGET_LIBRARIES
209+
qMRMLWidgets
210+
MRMLLogic
211+
qSlicerBaseQTCore
212+
+ Qt5::Multimedia
213+
+ DCMTK
214+
)
215+
216+
set(MODULE_UI_SRCS
217+
diff --git a/PlusRemote/Logic/CMakeLists.txt b/PlusRemote/Logic/CMakeLists.txt
218+
index ae75d1b..4cf2506 100644
219+
--- a/PlusRemote/Logic/CMakeLists.txt
220+
+++ b/PlusRemote/Logic/CMakeLists.txt
221+
@@ -10,6 +10,10 @@ set(${KIT}_INCLUDE_DIRECTORIES
222+
${vtkSlicerVolumeRenderingModuleMRML_INCLUDE_DIRS}
223+
${vtkSlicerVolumeRenderingModuleMRMLDisplayableManager_SOURCE_DIR}
224+
${vtkSlicerVolumeRenderingModuleMRMLDisplayableManager_BINARY_DIR}
225+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerAnnotationsModuleMRML
226+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerMarkupsModuleMRML
227+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerVolumeRenderingModuleLogic
228+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerVolumeRenderingModuleMRML
229+
)
230+
231+
set(${KIT}_SRCS
232+
diff --git a/PlusRemote/MRML/CMakeLists.txt b/PlusRemote/MRML/CMakeLists.txt
233+
index 767a957..b12bfbc 100644
234+
--- a/PlusRemote/MRML/CMakeLists.txt
235+
+++ b/PlusRemote/MRML/CMakeLists.txt
236+
@@ -7,6 +7,8 @@ set(${KIT}_EXPORT_DIRECTIVE "VTK_SLICER_${MODULE_NAME_UPPER}_MODULE_MRML_EXPORT"
237+
set(${KIT}_INCLUDE_DIRECTORIES
238+
${vtkSlicerOpenIGTLinkIFModuleMRML_INCLUDE_DIRS}
239+
${Slicer_Base_INCLUDE_DIRS}
240+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerAnnotationsModuleMRML
241+
+ ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/vtkSlicerMarkupsModuleMRML
242+
)
243+
244+
if (Slicer_VERSION VERSION_LESS "4.11.0")
245+
@@ -31,6 +33,8 @@ set(${KIT}_TARGET_LIBRARIES
246+
vtkSlicerOpenIGTLinkIFModuleMRML
247+
)
248+
249+
+link_directories(${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR})
250+
+
251+
# --------------------------------------------------------------------------
252+
SlicerMacroBuildModuleMRML(
253+
NAME ${KIT}
254+
@@ -38,4 +42,4 @@ SlicerMacroBuildModuleMRML(
255+
INCLUDE_DIRECTORIES ${${KIT}_INCLUDE_DIRECTORIES}
256+
SRCS ${${KIT}_SRCS}
257+
TARGET_LIBRARIES ${${KIT}_TARGET_LIBRARIES}
258+
- )
259+
\ No newline at end of file
260+
+ )
261+
diff --git a/PlusRemote/Widgets/CMakeLists.txt b/PlusRemote/Widgets/CMakeLists.txt
262+
index 125fb2e..53ad8e6 100644
263+
--- a/PlusRemote/Widgets/CMakeLists.txt
264+
+++ b/PlusRemote/Widgets/CMakeLists.txt
265+
@@ -34,6 +34,8 @@ set(${KIT}_TARGET_LIBRARIES
266+
vtkSlicerOpenIGTLinkIFModuleMRML
267+
vtkSlicer${MODULE_NAME}ModuleMRML
268+
vtkSlicer${MODULE_NAME}ModuleLogic
269+
+ qMRMLWidgets
270+
+ DCMTK
271+
)
272+
273+
if (Slicer_VERSION VERSION_LESS "4.11.0")
274+
@@ -57,4 +59,4 @@ SlicerMacroBuildModuleWidgets(
275+
)
276+
277+
#-----------------------------------------------------------------------------
278+
-add_subdirectory(DesignerPlugins)
279+
\ No newline at end of file
280+
+add_subdirectory(DesignerPlugins)
281+
diff --git a/PlusRemote/Widgets/DesignerPlugins/CMakeLists.txt b/PlusRemote/Widgets/DesignerPlugins/CMakeLists.txt
282+
index 1074962..ff6a9a3 100644
283+
--- a/PlusRemote/Widgets/DesignerPlugins/CMakeLists.txt
284+
+++ b/PlusRemote/Widgets/DesignerPlugins/CMakeLists.txt
285+
@@ -21,12 +21,13 @@ set(${KIT}_MOC_SRCS
286+
287+
set(${KIT}_TARGET_LIBRARIES
288+
qSlicerPlusRemoteModuleWidgets
289+
+ DCMTK
290+
)
291+
292+
#-----------------------------------------------------------------------------
293+
# Designer plugins have to be installed at the same location as other
294+
# Slicer core designer plugins
295+
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Slicer_DIR}/bin)
296+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
297+
298+
ctkMacroBuildQtDesignerPlugin(
299+
NAME ${KIT}
300+
diff --git a/UltrasoundRemoteControl/Widgets/CMakeLists.txt b/UltrasoundRemoteControl/Widgets/CMakeLists.txt
301+
index 865aa5a..7506f71 100644
302+
--- a/UltrasoundRemoteControl/Widgets/CMakeLists.txt
303+
+++ b/UltrasoundRemoteControl/Widgets/CMakeLists.txt
304+
@@ -33,6 +33,7 @@ set(${KIT}_RESOURCES
305+
306+
set(${KIT}_TARGET_LIBRARIES
307+
vtkSlicerOpenIGTLinkIFModuleMRML
308+
+ qMRMLWidgets
309+
)
310+
311+
#-----------------------------------------------------------------------------

‎guix-systole/packages/slicer.scm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#:use-module (gnu packages gl)
1111
#:use-module (gnu packages gnome)
1212
#:use-module (gnu packages image)
13+
#:use-module (gnu packages image-processing)
1314
#:use-module (gnu packages libffi)
1415
#:use-module (gnu packages maths)
1516
#:use-module (gnu packages mpi)
@@ -184,6 +185,7 @@
184185

185186
)))
186187
(inputs (list libxt
188+
dcmtk
187189
eigen
188190
expat
189191
openssl-3.0

0 commit comments

Comments
 (0)