diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2023-07-03 16:45:17 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2023-07-04 16:46:49 +0000 |
| commit | 09a0c0ec159dd8c95a1fb31418a144d50b16f78d (patch) | |
| tree | cfb65cdc9d29bfd2381947fc3b4f2aabda0fde51 | |
| parent | 1487f1a0c00a1310bdd49f7a744f431a429e4657 (diff) | |
Auto-setup: Forward CMAKE_<LANG>_STANDARD to conan/vcpkgv11.0.0-rc1
Fixes: QTCREATORBUG-29292
Change-Id: Iee0b0639841d11fa14dcb57c1a4f9b4678aa0e2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | src/share/3rdparty/package-manager/auto-setup.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 4689cc9804..60c2144044 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -16,6 +16,17 @@ if (QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP) endif() option(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP "Skip Qt Creator's package manager auto-setup" OFF) +macro(qtc_auto_setup_compiler_standard toolchainFile) + foreach(lang_var C CXX CUDA OBJC OBJCXX) + foreach(prop_var STANDARD STANDARD_REQUIRED EXTENSIONS) + if (CMAKE_${lang_var}_${prop_var}) + file(APPEND "${toolchainFile}" + "set(CMAKE_${lang_var}_${prop_var} ${CMAKE_${lang_var}_${prop_var}})\n") + endif() + endforeach() + endforeach() +endmacro() + # # conan # @@ -77,6 +88,8 @@ macro(qtc_auto_setup_conan) set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\") set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\") ") + qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake") + if (CMAKE_TOOLCHAIN_FILE) file(APPEND "${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake" "include(\"${CMAKE_TOOLCHAIN_FILE}\")\n") @@ -175,6 +188,8 @@ macro(qtc_auto_setup_vcpkg) set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\") set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\") ") + qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake") + if (CMAKE_TOOLCHAIN_FILE AND NOT CMAKE_TOOLCHAIN_FILE STREQUAL "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake") file(APPEND "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake" |