diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-08 12:14:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-08 12:23:55 (GMT) |
| commit | adba2945b301ae1bc35dfbc70125654c8db237a7 (patch) | |
| tree | 2258a19fdfeebb74c9e935864b673d00b1934fa6 /Utilities | |
| parent | 58426958ab159ed1f05f6425f914f969dc954e25 (diff) | |
| download | CMake-adba2945b301ae1bc35dfbc70125654c8db237a7.zip CMake-adba2945b301ae1bc35dfbc70125654c8db237a7.tar.gz CMake-adba2945b301ae1bc35dfbc70125654c8db237a7.tar.bz2 | |
Utilities/Release: Update to Qt 5.12 on Windows builds
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/win32_release.cmake | 8 | ||||
| -rw-r--r-- | Utilities/Release/win64_release.cmake | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index e76e333..1e4421c 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -8,12 +8,16 @@ set(CPACK_BINARY_GENERATORS "WIX ZIP") set(CPACK_SOURCE_GENERATORS "ZIP") set(MAKE_PROGRAM "ninja") set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.6.3/msvc2017-32-xp-mt") +set(qt_prefix "c:/Qt/5.12.1/msvc2017-32-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/lib/Qt5PlatformSupport.lib + ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib + ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib + ${qt_prefix}/lib/Qt5ThemeSupport.lib ${qt_prefix}/lib/qtfreetype.lib + ${qt_prefix}/lib/qtlibpng.lib imm32.lib + wtsapi32.lib ) set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_DOC_DIR:STRING=doc/cmake diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 511f0a3..98eaf19 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -8,12 +8,16 @@ set(CPACK_BINARY_GENERATORS "WIX ZIP") set(CPACK_SOURCE_GENERATORS "") set(MAKE_PROGRAM "ninja") set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.6.3/msvc2017-64-xp-mt") +set(qt_prefix "c:/Qt/5.12.1/msvc2017-64-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/lib/Qt5PlatformSupport.lib + ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib + ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib + ${qt_prefix}/lib/Qt5ThemeSupport.lib ${qt_prefix}/lib/qtfreetype.lib + ${qt_prefix}/lib/qtlibpng.lib imm32.lib + wtsapi32.lib ) set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_DOC_DIR:STRING=doc/cmake |