From dc85b2d73e4dc158e21a4386f47528dc1c2201a2 Mon Sep 17 00:00:00 2001
From: melon <arbeit.t.lechner@gmail.com>
Date: Wed, 31 Jan 2024 01:07:47 +0100
Subject: [PATCH 1/2] fix cmake error when building with -DMYSQL=ON

---
 cmake/FindMySQL.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 6919d3a0b..b51ba6196 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -4,7 +4,7 @@ if(NOT CMAKE_CROSSCOMPILING)
   )
 
   if(MYSQL_CONFIG)
-    exec_program(${MYSQL_CONFIG}
+    execute_process(COMMAND ${MYSQL_CONFIG}
       ARGS --include
       OUTPUT_VARIABLE MY_TMP
     )
@@ -13,7 +13,7 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     set(MYSQL_CONFIG_INCLUDE_DIR ${MY_TMP} CACHE FILEPATH INTERNAL)
 
-    exec_program(${MYSQL_CONFIG}
+    execute_process(COMMAND ${MYSQL_CONFIG}
       ARGS --libs_r
       OUTPUT_VARIABLE MY_TMP
     )

From 39546b3debc8cc1466d321651c29ec6e26d521bb Mon Sep 17 00:00:00 2001
From: BlaiZephyr <arbeit.t.lechner@gmail.com>
Date: Fri, 16 Feb 2024 14:57:34 +0100
Subject: [PATCH 2/2] attempt 2 - sanitize output

---
 cmake/FindMySQL.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index b51ba6196..363e88ccd 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -7,6 +7,7 @@ if(NOT CMAKE_CROSSCOMPILING)
     execute_process(COMMAND ${MYSQL_CONFIG}
       ARGS --include
       OUTPUT_VARIABLE MY_TMP
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
@@ -16,6 +17,7 @@ if(NOT CMAKE_CROSSCOMPILING)
     execute_process(COMMAND ${MYSQL_CONFIG}
       ARGS --libs_r
       OUTPUT_VARIABLE MY_TMP
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
     set(MYSQL_CONFIG_LIBRARIES "")