diff --git a/tools/conan-profiles/vs-19-debug b/tools/conan-profiles/vs-26-debug similarity index 70% rename from tools/conan-profiles/vs-19-debug rename to tools/conan-profiles/vs-26-debug index 7e2a340e70e..26b6c5f7993 100644 --- a/tools/conan-profiles/vs-19-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=192 +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-19-debug-ninja b/tools/conan-profiles/vs-26-debug-ninja similarity index 74% rename from tools/conan-profiles/vs-19-debug-ninja rename to tools/conan-profiles/vs-26-debug-ninja index 46df1bcc1e7..a05efc22e8b 100644 --- a/tools/conan-profiles/vs-19-debug-ninja +++ b/tools/conan-profiles/vs-26-debug-ninja @@ -4,7 +4,7 @@ arch=x86_64 compiler=msvc # Both libnode and webrtc-audio-processing require C++20 compiler.cppstd=20 -compiler.version=192 +compiler.version=195 compiler.runtime=dynamic compiler.runtime_type=Debug build_type=Debug @@ -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-19-release b/tools/conan-profiles/vs-26-release similarity index 71% rename from tools/conan-profiles/vs-19-release rename to tools/conan-profiles/vs-26-release index a7bce7c6cc8..5728728ebb6 100644 --- a/tools/conan-profiles/vs-19-release +++ b/tools/conan-profiles/vs-26-release @@ -4,7 +4,7 @@ arch=x86_64 compiler=msvc # Both libnode and webrtc-audio-processing require C++20 compiler.cppstd=20 -compiler.version=192 +compiler.version=195 compiler.runtime=dynamic compiler.runtime_type=Release build_type=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-19-release-ninja b/tools/conan-profiles/vs-26-release-ninja similarity index 74% rename from tools/conan-profiles/vs-19-release-ninja rename to tools/conan-profiles/vs-26-release-ninja index da6a90bda23..6008462c6f4 100644 --- a/tools/conan-profiles/vs-19-release-ninja +++ b/tools/conan-profiles/vs-26-release-ninja @@ -4,7 +4,7 @@ arch=x86_64 compiler=msvc # Both libnode and webrtc-audio-processing require C++20 compiler.cppstd=20 -compiler.version=192 +compiler.version=195 compiler.runtime=dynamic compiler.runtime_type=Release build_type=Release @@ -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-19-relwithdebinfo b/tools/conan-profiles/vs-26-relwithdebinfo similarity index 61% rename from tools/conan-profiles/vs-19-relwithdebinfo rename to tools/conan-profiles/vs-26-relwithdebinfo index c89fd597d52..6cf51f5da42 100644 --- a/tools/conan-profiles/vs-19-relwithdebinfo +++ b/tools/conan-profiles/vs-26-relwithdebinfo @@ -1,16 +1,20 @@ [settings] os=Windows -os_build=Windows arch=x86_64 -arch_build=x86_64 -compiler=Visual Studio +compiler=msvc # Both libnode and webrtc-audio-processing require C++20 compiler.cppstd=20 -compiler.version=16 -build_type=Release +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 + +[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/winprepareVS19.bat b/winprepareVS19.bat deleted file mode 100644 index d0c68112933..00000000000 --- a/winprepareVS19.bat +++ /dev/null @@ -1,8 +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 -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 new file mode 100644 index 00000000000..0cd90a39290 --- /dev/null +++ b/winprepareVS26.bat @@ -0,0 +1,7 @@ +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 \ No newline at end of file