+++ /dev/null
-diff --git a/src/itk.mk b/src/itk.mk
-index a8194fa..5c48425 100644
---- a/src/itk.mk
-+++ b/src/itk.mk
-@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 334312cc31925fd6c2622c9cd4ed33fecbbbd5b97e03b93f34b259d08352e
- $(PKG)_SUBDIR := InsightToolkit-$($(PKG)_VERSION)
- $(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz
- $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--$(PKG)_DEPS := gcc expat hdf5 jpeg libpng tiff zlib
-+$(PKG)_DEPS := gcc expat hdf5 jpeg libpng tiff zlib vtk
-
- define $(PKG)_UPDATE
- $(WGET) -q -O- 'https://itk.org/ITK/resources/software.html' | \
-@@ -31,6 +31,10 @@ define $(PKG)_BUILD
- -DITK_USE_SYSTEM_PNG=TRUE \
- -DITK_USE_SYSTEM_TIFF=TRUE \
- -DITK_USE_SYSTEM_ZLIB=TRUE \
-+ -DModule_ITKReview=TRUE \
-+ -DModule_ITKVtkGlue=TRUE \
-+ -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
-+ -DCMAKE_RELEASE_POSTFIX=_cpPlugins \
- '$(1)'
- $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
- endef
-diff --git a/src/qtbase.mk b/src/qtbase.mk
-index c02650c4..c46867a6 100644
---- a/src/qtbase.mk
-+++ b/src/qtbase.mk
-@@ -64,51 +64,22 @@ define $(PKG)_BUILD
- -dbus-linked \
- -no-pch \
- -v \
-- $($(PKG)_CONFIGURE_OPTS)
-+ $($(PKG)_CONFIGURE_OPTS) \
-+ -qtlibinfix _cpPlugins
-
- $(MAKE) -C '$(1)' -j '$(JOBS)'
- rm -rf '$(PREFIX)/$(TARGET)/qt5'
- $(MAKE) -C '$(1)' -j 1 install
- ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
-
-- mkdir '$(1)/test-qt'
-- cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
-- $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE)
-- $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/'
--
-- # build test the manual way
-- mkdir '$(1)/test-$(PKG)-pkgconfig'
-- '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
-- '$(PREFIX)/$(TARGET)/qt5/bin/moc' \
-- -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
-- -I'$(1)/test-$(PKG)-pkgconfig' \
-- '$(TOP_DIR)/src/qt-test.hpp'
-- '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc'
-- '$(TARGET)-g++' \
-- -W -Wall -Werror -std=c++0x -pedantic \
-- '$(TOP_DIR)/src/qt-test.cpp' \
-- '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
-- '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \
-- -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
-- -I'$(1)/test-$(PKG)-pkgconfig' \
-- `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs`
--
- # setup cmake toolchain
- echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
-
-- # batch file to run test programs
-- (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \
-- printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \
-- printf 'test-qt5.exe\r\n'; \
-- printf 'test-qtbase-pkgconfig.exe\r\n';) \
-- > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat'
--
- # add libs to CMake config of Qt5Core to fix static linking
- $(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'
- $(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'
- $(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'
- endef
-
--
- $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
- $($(PKG)_BUILD))
-diff --git a/src/vtk-1-fixes.patch b/src/vtk-1-fixes.patch
-index 1e13226f..23957a3f 100644
---- a/src/vtk-1-fixes.patch
-+++ b/src/vtk-1-fixes.patch
-@@ -68,3 +68,23 @@ Subject: [PATCH] fix libharu shared linking
- endif()
- # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED
- if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED)
-+
-+--- a/GUISupport/Qt/PluginInstall.cmake.in 2017-08-30 15:55:05.000000000 -0500
-++++ b/GUISupport/Qt/PluginInstall.cmake.in 2017-10-06 18:20:24.746721343 -0500
-+@@ -3,12 +3,10 @@
-+ set(VTK_INSTALL_QT_DIR "@VTK_INSTALL_QT_DIR@")
-+ set(VTK_INSTALL_QT_PLUGIN_DIR "@VTK_INSTALL_QT_PLUGIN_DIR@")
-+ set(BUILDTYPE_SUFFIX)
-+-if (WIN32)
-+- if (BUILD_TYPE STREQUAL "Debug")
-+- set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
-+- else ()
-+- set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
-+- endif ()
-++if (BUILD_TYPE STREQUAL "Debug")
-++ set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
-++else ()
-++ set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
-+ endif ()
-+ set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
-+ set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@")
-diff --git a/src/vtk.mk b/src/vtk.mk
-index 47d5419c..d7d397ad 100644
---- a/src/vtk.mk
-+++ b/src/vtk.mk
-@@ -49,7 +49,10 @@ define $(PKG)_BUILD
- -DVTK_FORBID_DOWNLOADS=ON \
- -DVTK_USE_SYSTEM_LIBHARU=ON \
- -DBUILD_EXAMPLES=OFF \
-- -DBUILD_TESTING=OFF
-+ -DBUILD_TESTING=OFF \
-+ -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
-+ -DCMAKE_RELEASE_POSTFIX=_cpPlugins
-+
- $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
- $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
-
git://git.creatis.insa-lyon.fr / cpPlugins.git / blobdiff