config/mxe.patch

   1 diff --git a/src/itk.mk b/src/itk.mk
   2 index a8194fa9..ae5df898 100644
   3 --- a/src/itk.mk
   4 +++ b/src/itk.mk
   5 @@ -31,6 +31,10 @@ define $(PKG)_BUILD
   6          -DITK_USE_SYSTEM_PNG=TRUE \
   7          -DITK_USE_SYSTEM_TIFF=TRUE \
   8          -DITK_USE_SYSTEM_ZLIB=TRUE \
   9 +        -DModule_ITKReview=TRUE \
  10 +        -DModule_ITKVtkGlue=TRUE \
  11 +        -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
  12 +        -DCMAKE_RELEASE_POSTFIX=_cpPlugins \
  13          '$(1)'
  14      $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
  15  endef
  16 diff --git a/src/qtbase.mk b/src/qtbase.mk
  17 index c02650c4..c46867a6 100644
  18 --- a/src/qtbase.mk
  19 +++ b/src/qtbase.mk
  20 @@ -64,51 +64,22 @@ define $(PKG)_BUILD
  21              -dbus-linked \
  22              -no-pch \
  23              -v \
  24 -            $($(PKG)_CONFIGURE_OPTS)
  25 +            $($(PKG)_CONFIGURE_OPTS) \
  26 +            -qtlibinfix _cpPlugins
  27
  28      $(MAKE) -C '$(1)' -j '$(JOBS)'
  29      rm -rf '$(PREFIX)/$(TARGET)/qt5'
  30      $(MAKE) -C '$(1)' -j 1 install
  31      ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
  32
  33 -    mkdir            '$(1)/test-qt'
  34 -    cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
  35 -    $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE)
  36 -    $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/'
  37 -
  38 -    # build test the manual way
  39 -    mkdir '$(1)/test-$(PKG)-pkgconfig'
  40 -    '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
  41 -    '$(PREFIX)/$(TARGET)/qt5/bin/moc' \
  42 -        -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
  43 -        -I'$(1)/test-$(PKG)-pkgconfig' \
  44 -        '$(TOP_DIR)/src/qt-test.hpp'
  45 -    '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc'
  46 -    '$(TARGET)-g++' \
  47 -        -W -Wall -Werror -std=c++0x -pedantic \
  48 -        '$(TOP_DIR)/src/qt-test.cpp' \
  49 -        '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
  50 -        '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \
  51 -        -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
  52 -        -I'$(1)/test-$(PKG)-pkgconfig' \
  53 -        `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs`
  54 -
  55      # setup cmake toolchain
  56      echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
  57
  58 -    # batch file to run test programs
  59 -    (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \
  60 -     printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \
  61 -     printf 'test-qt5.exe\r\n'; \
  62 -     printf 'test-qtbase-pkgconfig.exe\r\n';) \
  63 -     > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat'
  64 -
  65      # add libs to CMake config of Qt5Core to fix static linking
  66      $(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'
  67      $(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'
  68      $(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'
  69  endef
  70
  71 -
  72  $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
  73                        $($(PKG)_BUILD))
  74 diff --git a/src/vtk-1-fixes.patch b/src/vtk-1-fixes.patch
  75 index 1e13226f..23957a3f 100644
  76 --- a/src/vtk-1-fixes.patch
  77 +++ b/src/vtk-1-fixes.patch
  78 @@ -68,3 +68,23 @@ Subject: [PATCH] fix libharu shared linking
  79   endif()
  80   # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED
  81   if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED)
  82 +
  83 +--- a/GUISupport/Qt/PluginInstall.cmake.in     2017-08-30 15:55:05.000000000 -0500
  84 ++++ b/GUISupport/Qt/PluginInstall.cmake.in     2017-10-06 18:20:24.746721343 -0500
  85 +@@ -3,12 +3,10 @@
  86 + set(VTK_INSTALL_QT_DIR "@VTK_INSTALL_QT_DIR@")
  87 + set(VTK_INSTALL_QT_PLUGIN_DIR "@VTK_INSTALL_QT_PLUGIN_DIR@")
  88 + set(BUILDTYPE_SUFFIX)
  89 +-if (WIN32)
  90 +-  if (BUILD_TYPE STREQUAL "Debug")
  91 +-    set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
  92 +-  else ()
  93 +-    set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
  94 +-  endif ()
  95 ++if (BUILD_TYPE STREQUAL "Debug")
  96 ++  set(BUILDTYPE_SUFFIX @CMAKE_DEBUG_POSTFIX@)
  97 ++else ()
  98 ++  set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@)
  99 + endif ()
 100 + set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
 101 + set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@")
 102 diff --git a/src/vtk.mk b/src/vtk.mk
 103 index 47d5419c..d7d397ad 100644
 104 --- a/src/vtk.mk
 105 +++ b/src/vtk.mk
 106 @@ -49,7 +49,10 @@ define $(PKG)_BUILD
 107          -DVTK_FORBID_DOWNLOADS=ON \
 108          -DVTK_USE_SYSTEM_LIBHARU=ON \
 109          -DBUILD_EXAMPLES=OFF \
 110 -        -DBUILD_TESTING=OFF
 111 +        -DBUILD_TESTING=OFF \
 112 +        -DCMAKE_DEBUG_POSTFIX=_cpPlugins \
 113 +        -DCMAKE_RELEASE_POSTFIX=_cpPlugins
 114 +
 115      $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
 116      $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
 117