From 668ffd0398c2aa813ca2e81fba57dc061249a0b9 Mon Sep 17 00:00:00 2001 From: mengxin Date: Tue, 10 Aug 2021 16:21:48 +0800 Subject: [PATCH 1/3] enable unwind --- libs/libdaemon/cmake/find_unwind.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libdaemon/cmake/find_unwind.cmake b/libs/libdaemon/cmake/find_unwind.cmake index a64105a8d45..c14e21dc382 100644 --- a/libs/libdaemon/cmake/find_unwind.cmake +++ b/libs/libdaemon/cmake/find_unwind.cmake @@ -7,6 +7,8 @@ else () option (USE_INTERNAL_UNWIND_LIBRARY "Set to FALSE to use system unwind library instead of bundled" OFF) endif () +option (ENABLE_UNWIgiND "Enable libunwind (better stacktraces)" ON) + if (ENABLE_UNWIND) option (USE_INTERNAL_UNWIND_LIBRARY "Set to FALSE to use system unwind library instead of bundled" ${NOT_UNBUNDLED}) From f80a7b7a7213e2b7bcc7e7c90fadc0e5fb544e46 Mon Sep 17 00:00:00 2001 From: Meng Xin <363042881@qq.com> Date: Tue, 10 Aug 2021 17:08:23 +0800 Subject: [PATCH 2/3] Update libs/libdaemon/cmake/find_unwind.cmake Co-authored-by: Fu Zhe --- libs/libdaemon/cmake/find_unwind.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libdaemon/cmake/find_unwind.cmake b/libs/libdaemon/cmake/find_unwind.cmake index c14e21dc382..50983d8b611 100644 --- a/libs/libdaemon/cmake/find_unwind.cmake +++ b/libs/libdaemon/cmake/find_unwind.cmake @@ -7,7 +7,7 @@ else () option (USE_INTERNAL_UNWIND_LIBRARY "Set to FALSE to use system unwind library instead of bundled" OFF) endif () -option (ENABLE_UNWIgiND "Enable libunwind (better stacktraces)" ON) +option (ENABLE_UNWIND "Enable libunwind (better stacktraces)" ON) if (ENABLE_UNWIND) From 2191713135dbdc16c7eaed96f2dea004384e5cf2 Mon Sep 17 00:00:00 2001 From: mengxin Date: Tue, 10 Aug 2021 18:08:57 +0800 Subject: [PATCH 3/3] move to root CMakeList --- CMakeLists.txt | 3 +++ libs/libdaemon/cmake/find_unwind.cmake | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d0759fd6ad..272340a4aef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,6 +325,9 @@ include (libs/libcommon/cmake/find_cctz.cmake) if (ENABLE_MYSQL_STORAGE) include (libs/libmysqlxx/cmake/find_mysqlclient.cmake) endif() + +option (ENABLE_UNWIND "Enable libunwind (better stacktraces)" ON) + include (libs/libdaemon/cmake/find_unwind.cmake) include (cmake/print_flags.cmake) diff --git a/libs/libdaemon/cmake/find_unwind.cmake b/libs/libdaemon/cmake/find_unwind.cmake index c14e21dc382..a64105a8d45 100644 --- a/libs/libdaemon/cmake/find_unwind.cmake +++ b/libs/libdaemon/cmake/find_unwind.cmake @@ -7,8 +7,6 @@ else () option (USE_INTERNAL_UNWIND_LIBRARY "Set to FALSE to use system unwind library instead of bundled" OFF) endif () -option (ENABLE_UNWIgiND "Enable libunwind (better stacktraces)" ON) - if (ENABLE_UNWIND) option (USE_INTERNAL_UNWIND_LIBRARY "Set to FALSE to use system unwind library instead of bundled" ${NOT_UNBUNDLED})