From 6c542aafb2f0ba54efc9c8fbc326e10ee03bfc6e Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 18 Dec 2023 14:25:55 +0100 Subject: [PATCH 1/6] winsdk_version --- reference/commands/config.rst | 1 + reference/config_files/global_conf.rst | 1 + reference/tools/cmake/cmaketoolchain.rst | 1 + reference/tools/microsoft/msbuildtoolchain.rst | 1 + reference/tools/microsoft/vcvars.rst | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/reference/commands/config.rst b/reference/commands/config.rst index d1b86b8e902e..be33f62ca731 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -264,6 +264,7 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI tools.meson.mesontoolchain:backend: Any Meson backend: ninja, vs, vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, xcode tools.meson.mesontoolchain:extra_machine_files: List of paths for any additional native/cross file references to be appended to the existing Conan ones + tools.microsoft:winsdk_version: "Use this winsdk_version in vcvars tools.microsoft.bash:active: If Conan is already running inside bash terminal in Windows tools.microsoft.bash:path: The path to the shell to run when conanfile.win_bash==True tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index d137e828962e..0c12be79438d 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -111,6 +111,7 @@ To list all the possible configurations available, run :command:`conan config li tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI tools.meson.mesontoolchain:backend: Any Meson backend: ninja, vs, vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, xcode tools.meson.mesontoolchain:extra_machine_files: List of paths for any additional native/cross file references to be appended to the existing Conan ones + tools.microsoft:winsdk_version: "Use this winsdk_version in vcvars tools.microsoft.bash:active: If Conan is already running inside bash terminal in Windows tools.microsoft.bash:path: The path to the shell to run when conanfile.win_bash==True tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu diff --git a/reference/tools/cmake/cmaketoolchain.rst b/reference/tools/cmake/cmaketoolchain.rst index bfb3653184e7..ab783bb4f83e 100644 --- a/reference/tools/cmake/cmaketoolchain.rst +++ b/reference/tools/cmake/cmaketoolchain.rst @@ -513,6 +513,7 @@ CMakeToolchain is affected by these ``[conf]`` variables: - **tools.build:tools.apple:enable_arc** boolean value to enable/disable ARC Apple Clang flags, e.g., ``CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC``. - **tools.build:tools.apple:enable_visibility** boolean value to enable/disable Visibility Apple Clang flags, e.g., ``CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN``. - **tools.build:sysroot** defines the value of ``CMAKE_SYSROOT``. +- **tools.microsoft:winsdk_version** Defines the ``CMAKE_SYSTEM_VERSION`` or the ``CMAKE_GENERATOR_TOOLSET`` according to CMake policy ``CMP0149`` - **tools.build:compiler_executables** dict-like Python object which specifies the compiler as key and the compiler executable path as value. Those keys will be mapped as follows: diff --git a/reference/tools/microsoft/msbuildtoolchain.rst b/reference/tools/microsoft/msbuildtoolchain.rst index 1659493ae83c..dd96b78bc6f5 100644 --- a/reference/tools/microsoft/msbuildtoolchain.rst +++ b/reference/tools/microsoft/msbuildtoolchain.rst @@ -75,6 +75,7 @@ conf - ``tools.microsoft.msbuildtoolchain:compile_options`` dict-like object of extra compile options to be added to ```` section. The dict will be translated as follows: ``<[KEY]>[VALUE]``. +- ``tools.microsoft:winsdk_version`` value will define ```` in the toolchain file - ``tools.build:cxxflags`` list of extra C++ flags that will be appended to ```` section from ```` and ```` one. - ``tools.build:cflags`` list of extra of pure C flags that will be appended to ```` section from ```` and ```` one. - ``tools.build:sharedlinkflags`` list of extra linker flags that will be appended to ```` section from ```` one. diff --git a/reference/tools/microsoft/vcvars.rst b/reference/tools/microsoft/vcvars.rst index 7c2da5768dfb..80363576b25b 100644 --- a/reference/tools/microsoft/vcvars.rst +++ b/reference/tools/microsoft/vcvars.rst @@ -51,7 +51,7 @@ conf - ``tools.microsoft.msbuild:installation_path`` indicates the path to Visual Studio installation folder. For instance: ``C:\Program Files (x86)\Microsoft Visual Studio\2019\Community``, ``C:\Program Files (x86)\Microsoft Visual Studio 14.0``, etc. - +- ``tools.microsoft:winsdk_version`` will define the specific winsdk version in the vcvars command line Reference ----------- From d9d2f73515b231037efc114d19035c322d2ccfc2 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 18 Dec 2023 14:56:42 +0100 Subject: [PATCH 2/6] Update reference/commands/config.rst Co-authored-by: Carlos Zoido --- reference/commands/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/commands/config.rst b/reference/commands/config.rst index be33f62ca731..ca28e045e7a6 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -264,7 +264,7 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI tools.meson.mesontoolchain:backend: Any Meson backend: ninja, vs, vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, xcode tools.meson.mesontoolchain:extra_machine_files: List of paths for any additional native/cross file references to be appended to the existing Conan ones - tools.microsoft:winsdk_version: "Use this winsdk_version in vcvars + tools.microsoft:winsdk_version: Use this winsdk_version in vcvars tools.microsoft.bash:active: If Conan is already running inside bash terminal in Windows tools.microsoft.bash:path: The path to the shell to run when conanfile.win_bash==True tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu From 428e9d2b6c2c12819647411e77e2c64aca64bbf4 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 18 Dec 2023 14:56:46 +0100 Subject: [PATCH 3/6] Update reference/config_files/global_conf.rst Co-authored-by: Carlos Zoido --- reference/config_files/global_conf.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index 0c12be79438d..23ed20bc84b7 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -111,7 +111,7 @@ To list all the possible configurations available, run :command:`conan config li tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI tools.meson.mesontoolchain:backend: Any Meson backend: ninja, vs, vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, xcode tools.meson.mesontoolchain:extra_machine_files: List of paths for any additional native/cross file references to be appended to the existing Conan ones - tools.microsoft:winsdk_version: "Use this winsdk_version in vcvars + tools.microsoft:winsdk_version: Use this winsdk_version in vcvars tools.microsoft.bash:active: If Conan is already running inside bash terminal in Windows tools.microsoft.bash:path: The path to the shell to run when conanfile.win_bash==True tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu From e1aa838baa4f73372fb57b2a09d435a333dd5799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Tue, 19 Dec 2023 10:07:27 +0100 Subject: [PATCH 4/6] Update reference/tools/cmake/cmaketoolchain.rst --- reference/tools/cmake/cmaketoolchain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/cmake/cmaketoolchain.rst b/reference/tools/cmake/cmaketoolchain.rst index ab783bb4f83e..f4e9b5183055 100644 --- a/reference/tools/cmake/cmaketoolchain.rst +++ b/reference/tools/cmake/cmaketoolchain.rst @@ -513,7 +513,7 @@ CMakeToolchain is affected by these ``[conf]`` variables: - **tools.build:tools.apple:enable_arc** boolean value to enable/disable ARC Apple Clang flags, e.g., ``CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC``. - **tools.build:tools.apple:enable_visibility** boolean value to enable/disable Visibility Apple Clang flags, e.g., ``CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN``. - **tools.build:sysroot** defines the value of ``CMAKE_SYSROOT``. -- **tools.microsoft:winsdk_version** Defines the ``CMAKE_SYSTEM_VERSION`` or the ``CMAKE_GENERATOR_TOOLSET`` according to CMake policy ``CMP0149`` +- **tools.microsoft:winsdk_version** Defines the ``CMAKE_SYSTEM_VERSION`` or the ``CMAKE_GENERATOR_TOOLSET`` according to CMake policy ``CMP0149``. - **tools.build:compiler_executables** dict-like Python object which specifies the compiler as key and the compiler executable path as value. Those keys will be mapped as follows: From d635b658a4165379afd34376b096338b2075b74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Tue, 19 Dec 2023 10:07:34 +0100 Subject: [PATCH 5/6] Update reference/tools/microsoft/vcvars.rst --- reference/tools/microsoft/vcvars.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/microsoft/vcvars.rst b/reference/tools/microsoft/vcvars.rst index 80363576b25b..cad0cb90b67d 100644 --- a/reference/tools/microsoft/vcvars.rst +++ b/reference/tools/microsoft/vcvars.rst @@ -51,7 +51,7 @@ conf - ``tools.microsoft.msbuild:installation_path`` indicates the path to Visual Studio installation folder. For instance: ``C:\Program Files (x86)\Microsoft Visual Studio\2019\Community``, ``C:\Program Files (x86)\Microsoft Visual Studio 14.0``, etc. -- ``tools.microsoft:winsdk_version`` will define the specific winsdk version in the vcvars command line +- ``tools.microsoft:winsdk_version`` defines the specific winsdk version in the vcvars command line. Reference ----------- From 546baf53738c9c405321b6a0b37c0303515ff6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Tue, 19 Dec 2023 10:07:40 +0100 Subject: [PATCH 6/6] Update reference/tools/microsoft/msbuildtoolchain.rst --- reference/tools/microsoft/msbuildtoolchain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/microsoft/msbuildtoolchain.rst b/reference/tools/microsoft/msbuildtoolchain.rst index dd96b78bc6f5..ec2ffa2e7a1c 100644 --- a/reference/tools/microsoft/msbuildtoolchain.rst +++ b/reference/tools/microsoft/msbuildtoolchain.rst @@ -75,7 +75,7 @@ conf - ``tools.microsoft.msbuildtoolchain:compile_options`` dict-like object of extra compile options to be added to ```` section. The dict will be translated as follows: ``<[KEY]>[VALUE]``. -- ``tools.microsoft:winsdk_version`` value will define ```` in the toolchain file +- ``tools.microsoft:winsdk_version`` value will define the ```` element in the toolchain file. - ``tools.build:cxxflags`` list of extra C++ flags that will be appended to ```` section from ```` and ```` one. - ``tools.build:cflags`` list of extra of pure C flags that will be appended to ```` section from ```` and ```` one. - ``tools.build:sharedlinkflags`` list of extra linker flags that will be appended to ```` section from ```` one.