diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-02-27 09:48:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-02-27 09:48:12 +0100 |
| commit | 380f7622de6e164465614cf12a98f4c00e2c92c4 (patch) | |
| tree | 00e5090d58aab8ad9cdfc0793fac0caa318809f4 /cmake | |
| parent | 5169469911cf34c178a1741dc9b1199235f17775 (diff) | |
| parent | ca8d4082ecfa2efc3c8f105a8b07b7fc64e34432 (diff) | |
| download | qt-creator-380f7622de6e164465614cf12a98f4c00e2c92c4.tar.gz | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/debugger/watchhandler.cpp
Change-Id: If759b6260dfa008738d3a0ce543eb0eead8a8bba
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CreatePythonXY.cmake | 2 | ||||
| -rw-r--r-- | cmake/Findyaml-cpp.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/CreatePythonXY.cmake b/cmake/CreatePythonXY.cmake index 0475b259f6..637c4940c8 100644 --- a/cmake/CreatePythonXY.cmake +++ b/cmake/CreatePythonXY.cmake @@ -3,7 +3,7 @@ function(create_python_xy PythonExe PythonZipFilePath) get_filename_component(python_lib_dir "${PythonExe}" DIRECTORY) get_filename_component(python_lib_dir "${python_lib_dir}/Lib" ABSOLUTE) - foreach(dir collections encodings importlib json urllib) + foreach(dir collections encodings importlib json urllib re) file(COPY ${python_lib_dir}/${dir} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/python-lib FILES_MATCHING PATTERN "*.py" diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake index e6b65053bf..e7b3d361d3 100644 --- a/cmake/Findyaml-cpp.cmake +++ b/cmake/Findyaml-cpp.cmake @@ -124,7 +124,7 @@ else() set(yaml-cpp_FOUND 1) set_package_properties(yaml-cpp PROPERTIES DESCRIPTION "using internal src/libs/3rdparty/yaml-cpp") if(MSVC) - target_compile_options(yaml-cpp PUBLIC /wd4251 /wd4275) + target_compile_options(yaml-cpp PUBLIC /wd4251 /wd4275 /EHsc) endif() endif() unset(YAML_SOURCE_DIR) |