1 diff --git a/src/itk.mk b/src/itk.mk
2 index a8194fa..5c48425 100644
5 @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 334312cc31925fd6c2622c9cd4ed33fecbbbd5b97e03b93f34b259d08352e
6 $(PKG)_SUBDIR := InsightToolkit-$($(PKG)_VERSION)
7 $(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz
8 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
9 -$(PKG)_DEPS := gcc expat hdf5 jpeg libpng tiff zlib
10 +$(PKG)_DEPS := gcc expat hdf5 jpeg libpng tiff zlib vtk
13 $(WGET) -q -O- 'https://itk.org/ITK/resources/software.html' | \
14 @@ -31,6 +31,10 @@ define $(PKG)_BUILD
15 -DITK_USE_SYSTEM_PNG=TRUE \
16 -DITK_USE_SYSTEM_TIFF=TRUE \
17 -DITK_USE_SYSTEM_ZLIB=TRUE \
18 + -DModule_ITKReview=TRUE \
19 + -DModule_ITKVtkGlue=TRUE \
20 + -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
21 + -DCMAKE_RELEASE_POSTFIX=_cpPlugins \
23 $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
25 diff --git a/src/qtbase.mk b/src/qtbase.mk
26 index c02650c4..c46867a6 100644
29 @@ -64,51 +64,22 @@ define $(PKG)_BUILD
33 - $($(PKG)_CONFIGURE_OPTS)
34 + $($(PKG)_CONFIGURE_OPTS) \
35 + -qtlibinfix _cpPlugins
37 $(MAKE) -C '$(1)' -j '$(JOBS)'
38 rm -rf '$(PREFIX)/$(TARGET)/qt5'
39 $(MAKE) -C '$(1)' -j 1 install
40 ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
42 - mkdir '$(1)/test-qt'
43 - cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
44 - $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE)
45 - $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/'
47 - # build test the manual way
48 - mkdir '$(1)/test-$(PKG)-pkgconfig'
49 - '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
50 - '$(PREFIX)/$(TARGET)/qt5/bin/moc' \
51 - -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
52 - -I'$(1)/test-$(PKG)-pkgconfig' \
53 - '$(TOP_DIR)/src/qt-test.hpp'
54 - '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc'
56 - -W -Wall -Werror -std=c++0x -pedantic \
57 - '$(TOP_DIR)/src/qt-test.cpp' \
58 - '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
59 - '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \
60 - -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
61 - -I'$(1)/test-$(PKG)-pkgconfig' \
62 - `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs`
64 # setup cmake toolchain
65 echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
67 - # batch file to run test programs
68 - (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \
69 - printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \
70 - printf 'test-qt5.exe\r\n'; \
71 - printf 'test-qtbase-pkgconfig.exe\r\n';) \
72 - > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat'
74 # add libs to CMake config of Qt5Core to fix static linking
75 $(SED) -i 's,set(_Qt5Core_LIB_DEPENDENCIES \"\"),set(_Qt5Core_LIB_DEPENDENCIES \"ole32;uuid;ws2_32;advapi32;shell32;user32;kernel32;mpr;version;winmm;z;pcre2-16\"),g' '$(PREFIX)/$(TARGET)/qt5/lib/cmake/Qt5Core/Qt5CoreConfig.cmake'
76 $(SED) -i 's,set(_Qt5Gui_LIB_DEPENDENCIES \"Qt5::Core\"),set(_Qt5Gui_LIB_DEPENDENCIES \"Qt5::Core;ole32;uuid;ws2_32;advapi32;shell32;user32;kernel32;mpr;version;winmm;z;pcre2-16;png16;harfbuzz;z\"),g' '$(PREFIX)/$(TARGET)/qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake'
77 $(SED) -i 's,set(_Qt5Widgets_LIB_DEPENDENCIES \"Qt5::Gui;Qt5::Core\"),set(_Qt5Widgets_LIB_DEPENDENCIES \"Qt5::Gui;Qt5::Core;gdi32;comdlg32;oleaut32;imm32;opengl32;png16;harfbuzz;ole32;uuid;ws2_32;advapi32;shell32;user32;kernel32;mpr;version;winmm;z;pcre2-16;shell32;uxtheme;dwmapi\"),g' '$(PREFIX)/$(TARGET)/qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake'
81 $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
83 diff --git a/src/vtk-1-fixes.patch b/src/vtk-1-fixes.patch
84 index 1e13226f..23957a3f 100644
85 --- a/src/vtk-1-fixes.patch
86 +++ b/src/vtk-1-fixes.patch
87 @@ -68,3 +68,23 @@ Subject: [PATCH] fix libharu shared linking
89 # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED
90 if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED)
92 +--- a/GUISupport/Qt/PluginInstall.cmake.in 2017-08-30 15:55:05.000000000 -0500
93 ++++ b/GUISupport/Qt/PluginInstall.cmake.in 2017-10-06 18:20:24.746721343 -0500
95 + set(VTK_INSTALL_QT_DIR "@VTK_INSTALL_QT_DIR@")
96 + set(VTK_INSTALL_QT_PLUGIN_DIR "@VTK_INSTALL_QT_PLUGIN_DIR@")
97 + set(BUILDTYPE_SUFFIX)
99 +- if (BUILD_TYPE STREQUAL "Debug")
100 +- set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
102 +- set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
104 ++if (BUILD_TYPE STREQUAL "Debug")
105 ++ set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
107 ++ set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
109 + set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
110 + set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@")
111 diff --git a/src/vtk.mk b/src/vtk.mk
112 index 47d5419c..d7d397ad 100644
115 @@ -49,7 +49,10 @@ define $(PKG)_BUILD
116 -DVTK_FORBID_DOWNLOADS=ON \
117 -DVTK_USE_SYSTEM_LIBHARU=ON \
118 -DBUILD_EXAMPLES=OFF \
119 - -DBUILD_TESTING=OFF
120 + -DBUILD_TESTING=OFF \
121 + -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
122 + -DCMAKE_RELEASE_POSTFIX=_cpPlugins
124 $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
125 $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1