aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Tan <wjsota@gmail.com>2022-04-20 23:38:27 +0800
committerYordan Karadzhov (VMware) <y.karadz@gmail.com>2022-04-21 15:07:21 +0300
commit6266446922f76c561131b2053dfd82ac0dd62e31 (patch)
treec5aea3067832fd90d6765dcda3c0f19da89efe75
parent2ae9cbb8d2457898b6fa7b6429854f33541be222 (diff)
downloadkernel-shark-6266446922f76c561131b2053dfd82ac0dd62e31.tar.gz
kernel-shark: Allow FreeSans otf in addition to ttf
FreeSans comes as otf rather than ttf in some cases. An example is the gnu-free-fonts on Arch. With this patch, both FreeSans.otf and FreeSans.ttf will be accepted to make kernelshark. Signed-off-by: Solomon Tan <wjsota@gmail.com> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6a76d88..9dd160e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ find_package(GLUT)
set(KS_FONT FreeSans)
if (NOT TT_FONT_FILE)
- execute_process(COMMAND bash "-c" "fc-list '${KS_FONT}' |grep ${KS_FONT}.ttf | cut -d':' -f 1 -z"
+ execute_process(COMMAND bash "-c" "fc-list '${KS_FONT}' |grep -E ${KS_FONT}'(\.otf|\.ttf)' | cut -d':' -f 1 -z"
OUTPUT_VARIABLE TT_FONT_FILE)
endif (NOT TT_FONT_FILE)