diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-15 13:46:59 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-18 00:59:32 +0000 |
| commit | df15a2fafc114787ded709e025a187b317eee200 (patch) | |
| tree | cde518a2117ea85c29d1df6f5c9a1aa75a2dd1e4 | |
| parent | 75522d57a8a8d4d038dc5c0954ce823f290ca7e7 (diff) | |
Fix clang-cl builds
Change-Id: I57d3c057e076445f902da509655728cb20a4a18b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit c8643e47b0ba8dc0f345c2feaabfa60e54f809c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dabf07b3d..5e9b0a586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,8 @@ if(NOT Gn_FOUND) PREFIX gn USES_TERMINAL_BUILD ON CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR> -DWEBENGINE_ROOT_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b5c30d3b9..b881a316e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -268,7 +268,7 @@ foreach(config ${configs}) if(${config} STREQUAL "Debug") list(APPEND gnArgArg is_debug=true symbol_level=2) - if(WIN32 AND NOT CLANG) + if(WIN32) list(APPEND gnArgArg enable_iterator_debugging=true v8_optimized_debug=false) endif() elseif(${config} STREQUAL "Release") @@ -336,9 +336,16 @@ foreach(config ${configs}) ARGS is_clang CONDITION CLANG ) - if(CLANG) - list(APPEND gnArgArg clang_use_chrome_plugins=false) + if(CLANG AND NOT MACOS) + # For some reason this doesn't work for our macOS CIs + get_filename_component(clangBasePath ${CMAKE_CXX_COMPILER} DIRECTORY) + get_filename_component(clangBasePath ${clangBasePath} DIRECTORY) + list(APPEND gnArgArg + clang_base_path="${clangBasePath}" + clang_use_chrome_plugins=false + ) endif() + extend_gn_list(gnArgArg ARGS use_gold CONDITION QT_FEATURE_use_gold_linker |