mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Coin: Fix env var for Oracle libraries and headers
While on windows the instantclient sdk also provides the relevant
(import) libs, on linux those libraries are only provided by
instantclient-basiclite package. Therfore setting the Oracle_ROOT env
var to the sdk dir will prevent the libraries to be found on linux.
The FindOracle.cmake module is already adjusted to look for the
libraries in ${Oracle_ROOT}, ${Oracle_ROOT}/lib and
${Oracle_ROOT}/sdk/lib so they should be found correctly even we don't
append 'sdk' for Oracle_ROOT on windows for consistency.
Task-number: QTBUG-128873
Change-Id: Icd211d5b503234de529c339581a4f42f0b5fc726
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
@@ -46,6 +46,6 @@ sudo unzip -o -q /tmp/${packageFile} -d ${installFolder}
|
||||
echo "Remove downloaded ${packageFile} ..."
|
||||
rm -rf /tmp/${packageFile}
|
||||
|
||||
SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/sdk/"
|
||||
SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/"
|
||||
|
||||
echo "Oracle Instant Client = $version" >> ~/versions.txt
|
||||
|
||||
@@ -40,7 +40,7 @@ Extract-7Zip $package $installFolder
|
||||
Write-Host "Remove downloaded $package ..."
|
||||
Remove $package
|
||||
|
||||
Set-EnvironmentVariable "Oracle_ROOT" "$installFolder\${distdir}\sdk\"
|
||||
Set-EnvironmentVariable "Oracle_ROOT" "$installFolder\${distdir}\"
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
Write-Output "Oracle Instant Client = $version" >> ~/versions.txt
|
||||
|
||||
Reference in New Issue
Block a user