mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 09:09:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'win-rel-qt5.12'

Browse Source 
adba2945b3 Utilities/Release: Update to Qt 5.12 on Windows builds
58426958ab Utilities/Release: Update for using Windows 10 SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3079
This commit is contained in:
Brad King
2019-03-08 14:35:18 +00:00
committed by Kitware Robot
parent 89215c8ccf adba2945b3
commit 9b2665fc2c
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utilities/Release/win32_release.cmake
+7 -3
View File
@@ -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")
Utilities/Release/win64_release.cmake
+7 -3
View File
@@ -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")