Commit 9b2665fc authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'win-rel-qt5.12'

adba2945 Utilities/Release: Update to Qt 5.12 on Windows builds
58426958 Utilities/Release: Update for using Windows 10 SDK
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3079
parents 89215c8c adba2945
Pipeline #131799 passed with stage
in 0 seconds
......@@ -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
......@@ -31,7 +35,7 @@ CMAKE_PREFIX_PATH:STRING=${qt_prefix}
CMake_TEST_Qt4:BOOL=OFF
CMake_TEST_Qt5:BOOL=OFF
")
set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000 -D_USING_V110_SDK71_")
set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000")
set(CFLAGS "${ppflags}")
set(CXXFLAGS "${ppflags}")
set(ENV ". ~/rel/env32")
......
......@@ -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
......@@ -31,7 +35,7 @@ CMAKE_PREFIX_PATH:STRING=${qt_prefix}
CMake_TEST_Qt4:BOOL=OFF
CMake_TEST_Qt5:BOOL=OFF
")
set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000 -D_USING_V110_SDK71_")
set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000")
set(CFLAGS "${ppflags}")
set(CXXFLAGS "${ppflags}")
set(ENV ". ~/rel/env64")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment