static installation fixes

4 files changed, 51 insertions, 7 deletions

diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index acdfd4ec8..1629819e8 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
 Version: 5.7
 Build-Depends:
-Description: Qt5 application framework base components. Webengine, examples and tests not included.
+Description: Qt5 application framework main components. Webengine, examples and tests not included.
diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake
index c7358dec6..9a5d7ff03 100644
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@@ -2,7 +2,6 @@ include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/qt-5.7.0)
 set(OUTPUT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-set(ENV{QMAKESPEC} win32-msvc2015)
 set(ENV{QTDIR} ${OUTPUT_PATH}/qtbase)
 set(ENV{PATH} "${OUTPUT_PATH}/qtbase/bin;$ENV{PATH}")
 
@@ -24,14 +23,23 @@ endif()
 file(MAKE_DIRECTORY ${OUTPUT_PATH})
 message(STATUS "Configuring ${TARGET_TRIPLET}")
 
-#if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
-#    list(APPEND QT_RUNTIME_LINKAGE "-static")
-#    list(APPEND QT_RUNTIME_LINKAGE "-static-runtime")
-#endif()
+if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
+    list(APPEND QT_RUNTIME_LINKAGE "-static")
+    list(APPEND QT_RUNTIME_LINKAGE "-static-runtime")
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES "${CMAKE_CURRENT_LIST_DIR}/set-static-qmakespec.patch"
+    )
+else()
+    vcpkg_apply_patches(
+        SOURCE_PATH ${SOURCE_PATH}
+        PATCHES "${CMAKE_CURRENT_LIST_DIR}/set-shared-qmakespec.patch"
+    )
+endif()
 
 vcpkg_execute_required_process(
     COMMAND "${SOURCE_PATH}/configure.bat"
-        -confirm-license -opensource
+        -confirm-license -opensource -developer-build -platform win32-msvc2015
         -debug-and-release -force-debug-info ${QT_RUNTIME_LINKAGE}
         -nomake examples -nomake tests -skip webengine
         -prefix "${CURRENT_PACKAGES_DIR}"
diff --git a/ports/qt5/set-shared-qmakespec.patch b/ports/qt5/set-shared-qmakespec.patch
new file mode 100644
index 000000000..d4b7c2a82
--- /dev/null
+++ b/ports/qt5/set-shared-qmakespec.patch
@@ -0,0 +1,18 @@
+diff --git a/qtbase/mkspecs/common/msvc-desktop.conf b/qtbase/mkspecs/common/msvc-desktop.conf
+index 80fcd9b..1b9d57b 100644
+--- a/qtbase/mkspecs/common/msvc-desktop.conf
++++ b/qtbase/mkspecs/common/msvc-desktop.conf
+@@ -29,9 +29,9 @@
+ QMAKE_YACCFLAGS         = -d
+ QMAKE_CFLAGS            = -nologo -Zc:wchar_t
+ QMAKE_CFLAGS_WARN_ON    = -W3
+ QMAKE_CFLAGS_WARN_OFF   = -W0
+-QMAKE_CFLAGS_RELEASE    = -O2 -MT
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi
+-QMAKE_CFLAGS_DEBUG      = -Zi -MTd
++QMAKE_CFLAGS_RELEASE    = -O2 -MD
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
++QMAKE_CFLAGS_DEBUG      = -Zi -MDd
+ QMAKE_CFLAGS_YACC       =
+ QMAKE_CFLAGS_LTCG       = -GL
+ 
\ No newline at end of file
diff --git a/ports/qt5/set-static-qmakespec.patch b/ports/qt5/set-static-qmakespec.patch
new file mode 100644
index 000000000..26b312f2f
--- /dev/null
+++ b/ports/qt5/set-static-qmakespec.patch
@@ -0,0 +1,18 @@
+diff --git a/qtbase/mkspecs/common/msvc-desktop.conf b/qtbase/mkspecs/common/msvc-desktop.conf
+index 1b9d57b..80fcd9b 100644
+--- a/qtbase/mkspecs/common/msvc-desktop.conf
++++ b/qtbase/mkspecs/common/msvc-desktop.conf
+@@ -29,9 +29,9 @@
+ QMAKE_YACCFLAGS         = -d
+ QMAKE_CFLAGS            = -nologo -Zc:wchar_t
+ QMAKE_CFLAGS_WARN_ON    = -W3
+ QMAKE_CFLAGS_WARN_OFF   = -W0
+-QMAKE_CFLAGS_RELEASE    = -O2 -MD
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
+-QMAKE_CFLAGS_DEBUG      = -Zi -MDd
++QMAKE_CFLAGS_RELEASE    = -O2 -MT
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi
++QMAKE_CFLAGS_DEBUG      = -Zi -MTd
+ QMAKE_CFLAGS_YACC       =
+ QMAKE_CFLAGS_LTCG       = -GL
+ 
\ No newline at end of file