Merge branch 'develop' into feature/placefiles

This commit is contained in:
Dan Paulat 2023-09-27 21:34:22 -05:00
commit 5774c432c9
5 changed files with 6 additions and 6 deletions

View file

@ -28,7 +28,7 @@ jobs:
compiler: msvc
msvc_arch: x64
msvc_version: 2022
qt_version: 6.5.2
qt_version: 6.5.3
qt_arch: win64_msvc2019_64
qt_modules: qtimageformats
qt_tools: ''
@ -44,7 +44,7 @@ jobs:
env_cc: gcc-11
env_cxx: g++-11
compiler: gcc
qt_version: 6.5.2
qt_version: 6.5.3
qt_arch: gcc_64
qt_modules: qtimageformats
qt_tools: ''

View file

@ -1,5 +1,5 @@
call tools\setup-common.bat
mkdir build-debug
cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/msvc2019_64 ..
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.3/msvc2019_64 ..
pause

View file

@ -2,4 +2,4 @@
./tools/setup-common.sh
mkdir -p build-debug
cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/gcc_64 ..
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.3/gcc_64 ..

View file

@ -1,5 +1,5 @@
call tools\setup-common.bat
mkdir build-release
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.2/msvc2019_64 ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.3/msvc2019_64 ..
pause

View file

@ -2,4 +2,4 @@
./tools/setup-common.sh
mkdir -p build-release
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.2/gcc_64 ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.3/gcc_64 ..