File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -55,7 +55,8 @@ if (MSVC)
55
55
56
56
# avoid warning C4819
57
57
#add_compile_options(-source-charset:utf-8)
58
- #add_compile_options(/utf-8)
58
+ # /utf-8 will set source charset and execution charset to utf-8, so we don't need to set source-charset:utf-8
59
+ add_compile_options (/utf-8 )
59
60
60
61
# ensure we use minimal "windows.h" lib without the crazy min max macros
61
62
add_compile_definitions (NOMINMAX WIN32_LEAN_AND_MEAN )
@@ -264,6 +265,7 @@ endif()
264
265
265
266
# MacOS
266
267
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" )
268
+ # qt6 need 10.15 or later
267
269
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.15" )
268
270
269
271
# copy bundle file
Original file line number Diff line number Diff line change 58
58
mkdir $build_path
59
59
cd $build_path
60
60
61
- cmake_params=" -DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=10.10 "
61
+ cmake_params=" -DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64"
62
62
cmake $cmake_params ../..
63
63
if [ $? -ne 0 ] ; then
64
64
echo " cmake failed"
You can’t perform that action at this time.
0 commit comments