diff --git a/.appveyor.yml b/.appveyor.yml index ffa7735..3ae2a64 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,8 +20,8 @@ configuration: environment: COMMS_BRANCH: v5.2.1 - COMMSDSL_BRANCH: v6.2.1 - CC_TOOLS_QT_BRANCH: v4.2.1 + COMMSDSL_BRANCH: v6.2.4 + CC_TOOLS_QT_BRANCH: v4.2.3 matrix: - CPP_STD: 11 - CPP_STD: 14 diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 70ccaa9..50529d0 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -4,8 +4,8 @@ on: [push] env: COMMS_BRANCH: v5.2.1 - COMMSDSL_BRANCH: v6.2.1 - CC_TOOLS_QT_BRANCH: v4.2.1 + COMMSDSL_BRANCH: v6.2.4 + CC_TOOLS_QT_BRANCH: v4.2.3 jobs: build_gcc_old_ubuntu_20_04: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d70822..7047b7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ option (DEMO3_BUILD_EXAMPLES "Build examples." ON) # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten" set (DEMO3_VERSION "2.5") -set (DEMO3_MIN_COMMSDSL_VERSION "6.2.1") +set (DEMO3_MIN_COMMSDSL_VERSION "6.2.4") set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals") diff --git a/script/appveyor_install.bat b/script/appveyor_install.bat index bf575a0..ced1e15 100644 --- a/script/appveyor_install.bat +++ b/script/appveyor_install.bat @@ -40,7 +40,7 @@ IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set TOOLCHAIN=msvc17 set QT_SUBDIR=msvc2019 set QT_VER=5.15.2 - set BOOST_VER=1_77_0 + set BOOST_VER=1_83_0 IF "%PLATFORM%"=="x86" ( echo Performing x86 build in VS2022 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"