mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-22 14:55:56 +08:00
e8a94de2ea
The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH was not correct on Apple Silicon Macs, where homebrew installs into /opt/homebrew/. There's also no point in passing on the library location via compiler environment variables, when we can use ODBC_ROOT. And we don't need to pass it on as a CMake define, as a environment variable works just fine. This decouples the provisioning of libiodbc from the build configurations. Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit124957a8cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit1bb142175a)
Continuous Integration ====================== This directory contains files used by Qt's Continuous Integration system (Coin). pre-provisioning ---------------- Contains scripts which are used to install software to tier1 machines manually. E.g. Visual studio installation takes too long to be included to automatic provisioning of tier2 templates. provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set. (Run as admin in PowerShell)