From 5e8feb69dfadf55204348c7e7ed3d5893fdfb592 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Tue, 1 Oct 2024 19:54:38 +0200
Subject: [PATCH] CMake/sql find modules: read foo_ROOT env var if available

Even though we set foo_ROOT in the provisioning scripts and CMake is
picking it up as the base dir, we should also use it as CMake variable
so we can look in other directories below foo_ROOT.

Change-Id: I193d8ff1c216a669162569d71891c3eb7b9b030f
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c68277c41b99d6791e3c1a5998b70c6cbbf6dc15)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/FindInterbase.cmake | 6 ++++++
 cmake/FindMySQL.cmake     | 6 +++++-
 cmake/FindOracle.cmake    | 6 ++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
index e9303f8d265..aaaf11500fd 100644
--- a/cmake/FindInterbase.cmake
+++ b/cmake/FindInterbase.cmake
@@ -21,6 +21,12 @@
 # ``Interbase::Interbase``
 #     The Interbase client library
 
+if(NOT DEFINED Interbase_ROOT)
+    if(DEFINED ENV{Interbase_ROOT})
+        set(Interbase_ROOT "$ENV{Interbase_ROOT}")
+    endif()
+endif()
+
 find_path(Interbase_INCLUDE_DIR
           NAMES ibase.h
           HINTS "${Interbase_INCLUDEDIR}" "${Interbase_ROOT}/include"
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 3dedca85759..94a8d27ae50 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -40,7 +40,11 @@
 #     The mysql client library
 
 if(NOT DEFINED MySQL_ROOT)
-    find_package(PkgConfig QUIET)
+    if(DEFINED ENV{MySQL_ROOT})
+        set(MySQL_ROOT "$ENV{MySQL_ROOT}")
+    else()
+        find_package(PkgConfig QUIET)
+    endif()
 endif()
 if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
     pkg_check_modules(PC_MySQL QUIET "mysqlclient")
diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
index 98819980b1a..c27fe0d2e6e 100644
--- a/cmake/FindOracle.cmake
+++ b/cmake/FindOracle.cmake
@@ -21,6 +21,12 @@
 # ``Oracle::Oracle``
 #     The oracle instant client library
 
+if(NOT DEFINED Oracle_ROOT)
+    if(DEFINED ENV{Oracle_ROOT})
+        set(Oracle_ROOT "$ENV{Oracle_ROOT}")
+    endif()
+endif()
+
 find_path(Oracle_INCLUDE_DIR
   NAMES oci.h
   HINTS ${Oracle_INCLUDE_DIR} "${Oracle_ROOT}" "${Oracle_ROOT}/include" "${Oracle_ROOT}/sdk/include"