From 9d6b7e77e788b56c68636ef66e7fecc7f9368d59 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Mon, 1 Jun 2026 22:40:44 +0100 Subject: [PATCH 1/5] prep for VS26. --- winprepareVS26.bat | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 winprepareVS26.bat diff --git a/winprepareVS26.bat b/winprepareVS26.bat new file mode 100644 index 00000000000..55e17b552ed --- /dev/null +++ b/winprepareVS26.bat @@ -0,0 +1,8 @@ +ECHO Running conan +conan install . -b missing -pr=tools/conan-profiles/vs-26-release -of build +conan install . -b missing -pr=tools/conan-profiles/vs-26-debug -of build +conan cache clean "*" -sbd +ECHO Running cmake +cmake --preset conan-default +ECHO CMake has finished +pause \ No newline at end of file From c200ebbde2cc11f5cb39ad5bb0b3836249216827 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 Date: Mon, 1 Jun 2026 22:40:44 +0100 Subject: [PATCH 2/5] prep for VS26. --- tools/conan-profiles/vs-26-debug | 14 ++++++++++++++ tools/conan-profiles/vs-26-debug-ninja | 16 ++++++++++++++++ tools/conan-profiles/vs-26-release | 14 ++++++++++++++ tools/conan-profiles/vs-26-release-ninja | 16 ++++++++++++++++ tools/conan-profiles/vs-26-relwithdebinfo | 16 ++++++++++++++++ winprepareVS26.bat | 8 ++++++++ 6 files changed, 84 insertions(+) create mode 100644 tools/conan-profiles/vs-26-debug create mode 100644 tools/conan-profiles/vs-26-debug-ninja create mode 100644 tools/conan-profiles/vs-26-release create mode 100644 tools/conan-profiles/vs-26-release-ninja create mode 100644 tools/conan-profiles/vs-26-relwithdebinfo create mode 100644 winprepareVS26.bat diff --git a/tools/conan-profiles/vs-26-debug b/tools/conan-profiles/vs-26-debug new file mode 100644 index 00000000000..f26f5e9f79f --- /dev/null +++ b/tools/conan-profiles/vs-26-debug @@ -0,0 +1,14 @@ +[settings] +os=Windows +arch=x86_64 +compiler=msvc +# Both libnode and webrtc-audio-processing require C++20 +compiler.cppstd=20 +compiler.version=194 +compiler.runtime=dynamic +compiler.runtime_type=Debug +build_type=Debug +[options] +Overte/*:qt_source=source +# Required for building oneTBB. +hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-26-debug-ninja b/tools/conan-profiles/vs-26-debug-ninja new file mode 100644 index 00000000000..4a4b3f88881 --- /dev/null +++ b/tools/conan-profiles/vs-26-debug-ninja @@ -0,0 +1,16 @@ +[settings] +os=Windows +arch=x86_64 +compiler=msvc +# Both libnode and webrtc-audio-processing require C++20 +compiler.cppstd=20 +compiler.version=195 +compiler.runtime=dynamic +compiler.runtime_type=Debug +build_type=Debug +[conf] +tools.cmake.cmaketoolchain:generator=Ninja +[options] +Overte/*:qt_source=source +# Required for building oneTBB. +hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-26-release b/tools/conan-profiles/vs-26-release new file mode 100644 index 00000000000..3c11108dd2f --- /dev/null +++ b/tools/conan-profiles/vs-26-release @@ -0,0 +1,14 @@ +[settings] +os=Windows +arch=x86_64 +compiler=msvc +# Both libnode and webrtc-audio-processing require C++20 +compiler.cppstd=20 +compiler.version=195 +compiler.runtime=dynamic +compiler.runtime_type=Release +build_type=Release +[options] +Overte/*:qt_source=source +# Required for building oneTBB. +hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-26-release-ninja b/tools/conan-profiles/vs-26-release-ninja new file mode 100644 index 00000000000..d446ad05d31 --- /dev/null +++ b/tools/conan-profiles/vs-26-release-ninja @@ -0,0 +1,16 @@ +[settings] +os=Windows +arch=x86_64 +compiler=msvc +# Both libnode and webrtc-audio-processing require C++20 +compiler.cppstd=20 +compiler.version=195 +compiler.runtime=dynamic +compiler.runtime_type=Release +build_type=Release +[conf] +tools.cmake.cmaketoolchain:generator=Ninja +[options] +Overte/*:qt_source=source +# Required for building oneTBB. +hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-26-relwithdebinfo b/tools/conan-profiles/vs-26-relwithdebinfo new file mode 100644 index 00000000000..313cf7e9539 --- /dev/null +++ b/tools/conan-profiles/vs-26-relwithdebinfo @@ -0,0 +1,16 @@ +[settings] +os=Windows +arch=x86_64 +compiler=msvc +# Both libnode and webrtc-audio-processing require C++20 +compiler.cppstd=20 +compiler.version=195 +compiler.runtime=dynamic +compiler.runtime_type=Release +build_type=RelWithDebInfo +# libnode's build system seems to only support Release and Debug on Windows. RelWithDebInfo is not a valid option. +libnode/*:build_type=Release +[options] +Overte/*:qt_source=source +# Required for building oneTBB. +hwloc/*:shared=True diff --git a/winprepareVS26.bat b/winprepareVS26.bat new file mode 100644 index 00000000000..55e17b552ed --- /dev/null +++ b/winprepareVS26.bat @@ -0,0 +1,8 @@ +ECHO Running conan +conan install . -b missing -pr=tools/conan-profiles/vs-26-release -of build +conan install . -b missing -pr=tools/conan-profiles/vs-26-debug -of build +conan cache clean "*" -sbd +ECHO Running cmake +cmake --preset conan-default +ECHO CMake has finished +pause \ No newline at end of file From c50c0922940ca5414734380c84ab83b7e8379ab2 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:52:14 +0100 Subject: [PATCH 3/5] Fixed conan building. --- tools/conan-profiles/vs-26-debug | 6 +++++- tools/conan-profiles/vs-26-debug-ninja | 4 ++++ tools/conan-profiles/vs-26-release | 3 +++ tools/conan-profiles/vs-26-release-ninja | 4 ++++ tools/conan-profiles/vs-26-relwithdebinfo | 4 ++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/conan-profiles/vs-26-debug b/tools/conan-profiles/vs-26-debug index f26f5e9f79f..26b6c5f7993 100644 --- a/tools/conan-profiles/vs-26-debug +++ b/tools/conan-profiles/vs-26-debug @@ -4,7 +4,7 @@ arch=x86_64 compiler=msvc # Both libnode and webrtc-audio-processing require C++20 compiler.cppstd=20 -compiler.version=194 +compiler.version=195 compiler.runtime=dynamic compiler.runtime_type=Debug build_type=Debug @@ -12,3 +12,7 @@ build_type=Debug Overte/*:qt_source=source # Required for building oneTBB. hwloc/*:shared=True + +[tool_requires] +# Many of our dependencies don't support CMake 4 yet. +!cmake/*: cmake/[>=3 <4] diff --git a/tools/conan-profiles/vs-26-debug-ninja b/tools/conan-profiles/vs-26-debug-ninja index 4a4b3f88881..a05efc22e8b 100644 --- a/tools/conan-profiles/vs-26-debug-ninja +++ b/tools/conan-profiles/vs-26-debug-ninja @@ -14,3 +14,7 @@ tools.cmake.cmaketoolchain:generator=Ninja Overte/*:qt_source=source # Required for building oneTBB. hwloc/*:shared=True + +[tool_requires] +# Many of our dependencies don't support CMake 4 yet. +!cmake/*: cmake/[>=3 <4] \ No newline at end of file diff --git a/tools/conan-profiles/vs-26-release b/tools/conan-profiles/vs-26-release index 3c11108dd2f..5728728ebb6 100644 --- a/tools/conan-profiles/vs-26-release +++ b/tools/conan-profiles/vs-26-release @@ -12,3 +12,6 @@ build_type=Release Overte/*:qt_source=source # Required for building oneTBB. hwloc/*:shared=True +[tool_requires] +# Many of our dependencies don't support CMake 4 yet. +!cmake/*: cmake/[>=3 <4] diff --git a/tools/conan-profiles/vs-26-release-ninja b/tools/conan-profiles/vs-26-release-ninja index d446ad05d31..6008462c6f4 100644 --- a/tools/conan-profiles/vs-26-release-ninja +++ b/tools/conan-profiles/vs-26-release-ninja @@ -14,3 +14,7 @@ tools.cmake.cmaketoolchain:generator=Ninja Overte/*:qt_source=source # Required for building oneTBB. hwloc/*:shared=True + +[tool_requires] +# Many of our dependencies don't support CMake 4 yet. +!cmake/*: cmake/[>=3 <4] \ No newline at end of file diff --git a/tools/conan-profiles/vs-26-relwithdebinfo b/tools/conan-profiles/vs-26-relwithdebinfo index 313cf7e9539..6cf51f5da42 100644 --- a/tools/conan-profiles/vs-26-relwithdebinfo +++ b/tools/conan-profiles/vs-26-relwithdebinfo @@ -14,3 +14,7 @@ libnode/*:build_type=Release Overte/*:qt_source=source # Required for building oneTBB. hwloc/*:shared=True + +[tool_requires] +# Many of our dependencies don't support CMake 4 yet. +!cmake/*: cmake/[>=3 <4] \ No newline at end of file From b6aec17d27e83be87b235cc120f81ea8def48a23 Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Wed, 3 Jun 2026 19:25:54 +0100 Subject: [PATCH 4/5] pauses removed Removed pauses as honestly it just clutters the command line. --- winprepareVS19.bat | 1 - winprepareVS22.bat | 3 +-- winprepareVS26.bat | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/winprepareVS19.bat b/winprepareVS19.bat index d0c68112933..7e3d4e1248a 100644 --- a/winprepareVS19.bat +++ b/winprepareVS19.bat @@ -5,4 +5,3 @@ conan cache clean "*" -sbd ECHO Running cmake cmake --preset conan-default ECHO CMake has finished -pause diff --git a/winprepareVS22.bat b/winprepareVS22.bat index 69d31e58004..ad44c3d4634 100644 --- a/winprepareVS22.bat +++ b/winprepareVS22.bat @@ -4,5 +4,4 @@ conan install . -b missing -pr=tools/conan-profiles/vs-22-debug -of build conan cache clean "*" -sbd ECHO Running cmake cmake --preset conan-default -ECHO CMake has finished -pause \ No newline at end of file +ECHO CMake has finished \ No newline at end of file diff --git a/winprepareVS26.bat b/winprepareVS26.bat index 55e17b552ed..0cd90a39290 100644 --- a/winprepareVS26.bat +++ b/winprepareVS26.bat @@ -4,5 +4,4 @@ conan install . -b missing -pr=tools/conan-profiles/vs-26-debug -of build conan cache clean "*" -sbd ECHO Running cmake cmake --preset conan-default -ECHO CMake has finished -pause \ No newline at end of file +ECHO CMake has finished \ No newline at end of file From 6c1fafccd9191cf4afecacfee6df95adf0847c8b Mon Sep 17 00:00:00 2001 From: OfficialR3ido101 <39566484+OfficialR3ido101@users.noreply.github.com> Date: Thu, 4 Jun 2026 18:22:22 +0100 Subject: [PATCH 5/5] Removed VS19 Removed Visual studio 2019 since we are no longer in need for it. This is also to keep the code base down. --- tools/conan-profiles/vs-19-debug | 14 -------------- tools/conan-profiles/vs-19-debug-ninja | 16 ---------------- tools/conan-profiles/vs-19-release | 14 -------------- tools/conan-profiles/vs-19-release-ninja | 16 ---------------- tools/conan-profiles/vs-19-relwithdebinfo | 16 ---------------- winprepareVS19.bat | 7 ------- 6 files changed, 83 deletions(-) delete mode 100644 tools/conan-profiles/vs-19-debug delete mode 100644 tools/conan-profiles/vs-19-debug-ninja delete mode 100644 tools/conan-profiles/vs-19-release delete mode 100644 tools/conan-profiles/vs-19-release-ninja delete mode 100644 tools/conan-profiles/vs-19-relwithdebinfo delete mode 100644 winprepareVS19.bat diff --git a/tools/conan-profiles/vs-19-debug b/tools/conan-profiles/vs-19-debug deleted file mode 100644 index 7e2a340e70e..00000000000 --- a/tools/conan-profiles/vs-19-debug +++ /dev/null @@ -1,14 +0,0 @@ -[settings] -os=Windows -arch=x86_64 -compiler=msvc -# Both libnode and webrtc-audio-processing require C++20 -compiler.cppstd=20 -compiler.version=192 -compiler.runtime=dynamic -compiler.runtime_type=Debug -build_type=Debug -[options] -Overte/*:qt_source=source -# Required for building oneTBB. -hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-19-debug-ninja b/tools/conan-profiles/vs-19-debug-ninja deleted file mode 100644 index 46df1bcc1e7..00000000000 --- a/tools/conan-profiles/vs-19-debug-ninja +++ /dev/null @@ -1,16 +0,0 @@ -[settings] -os=Windows -arch=x86_64 -compiler=msvc -# Both libnode and webrtc-audio-processing require C++20 -compiler.cppstd=20 -compiler.version=192 -compiler.runtime=dynamic -compiler.runtime_type=Debug -build_type=Debug -[conf] -tools.cmake.cmaketoolchain:generator=Ninja -[options] -Overte/*:qt_source=source -# Required for building oneTBB. -hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-19-release b/tools/conan-profiles/vs-19-release deleted file mode 100644 index a7bce7c6cc8..00000000000 --- a/tools/conan-profiles/vs-19-release +++ /dev/null @@ -1,14 +0,0 @@ -[settings] -os=Windows -arch=x86_64 -compiler=msvc -# Both libnode and webrtc-audio-processing require C++20 -compiler.cppstd=20 -compiler.version=192 -compiler.runtime=dynamic -compiler.runtime_type=Release -build_type=Release -[options] -Overte/*:qt_source=source -# Required for building oneTBB. -hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-19-release-ninja b/tools/conan-profiles/vs-19-release-ninja deleted file mode 100644 index da6a90bda23..00000000000 --- a/tools/conan-profiles/vs-19-release-ninja +++ /dev/null @@ -1,16 +0,0 @@ -[settings] -os=Windows -arch=x86_64 -compiler=msvc -# Both libnode and webrtc-audio-processing require C++20 -compiler.cppstd=20 -compiler.version=192 -compiler.runtime=dynamic -compiler.runtime_type=Release -build_type=Release -[conf] -tools.cmake.cmaketoolchain:generator=Ninja -[options] -Overte/*:qt_source=source -# Required for building oneTBB. -hwloc/*:shared=True diff --git a/tools/conan-profiles/vs-19-relwithdebinfo b/tools/conan-profiles/vs-19-relwithdebinfo deleted file mode 100644 index c89fd597d52..00000000000 --- a/tools/conan-profiles/vs-19-relwithdebinfo +++ /dev/null @@ -1,16 +0,0 @@ -[settings] -os=Windows -os_build=Windows -arch=x86_64 -arch_build=x86_64 -compiler=Visual Studio -# Both libnode and webrtc-audio-processing require C++20 -compiler.cppstd=20 -compiler.version=16 -build_type=Release -# libnode's build system seems to only support Release and Debug on Windows. RelWithDebInfo is not a valid option. -libnode/*:build_type=Release -[options] -Overte/*:qt_source=source -# Required for building oneTBB. -hwloc/*:shared=True diff --git a/winprepareVS19.bat b/winprepareVS19.bat deleted file mode 100644 index 7e3d4e1248a..00000000000 --- a/winprepareVS19.bat +++ /dev/null @@ -1,7 +0,0 @@ -ECHO Running conan -conan install . -b missing -pr=tools/conan-profiles/vs-19-release -of build -conan install . -b missing -pr=tools/conan-profiles/vs-19-debug -of build -conan cache clean "*" -sbd -ECHO Running cmake -cmake --preset conan-default -ECHO CMake has finished