| From 0f78b883f02651bd15a96a7294e01f94b28c20f8 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> |
| Date: Mon, 13 May 2019 13:42:14 +0200 |
| Subject: [PATCH] Fix find_program taglib-config when cross-compiling |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| When cross-compiling Gerbera CMakes `find_program()` will search for |
| binaries on the host. This is typically correct, e.g. when search for |
| compilers or shells. |
| |
| When cross-compiling searching for `taglib-config` should not find the |
| binary on the host, instead it should find the binary in the sysroot |
| directory, as the host `taglib-config` will output the wrong host paths |
| and libs, whereas the sysroot `taglib-config` will output the correct sysroot |
| paths and libs. |
| |
| Therefore, use the `CMAKE_FIND_ROOT_PATH_MODE_PROGRAM` variable when |
| cross-compiling. This variable controls whether the `CMAKE_FIND_ROOT_PATH` |
| and `CMAKE_SYSROOT` are used by find_program(). |
| |
| Backported from: 0f78b883f02651bd15a96a7294e01f94b28c20f8 |
| |
| Signed-off-by: Jรถrg Krause <joerg.krause@embedded.rocks> |
| --- |
| cmake/FindTaglib.cmake | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake |
| index 46a20ff2..7135d766 100644 |
| --- a/cmake/FindTaglib.cmake |
| +++ b/cmake/FindTaglib.cmake |
| @@ -19,6 +19,9 @@ ELSE() |
| endif(NOT TAGLIB_MIN_VERSION) |
| |
| if(NOT WIN32) |
| + if (CMAKE_CROSSCOMPILING) |
| + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) |
| + endif(CMAKE_CROSSCOMPILING) |
| find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS |
| ${BIN_INSTALL_DIR} |
| ) |
| -- |
| 2.22.0 |
| |
