(trafficserver) branch master updated: Fix Findunwind.cmake on RHEL (#11001)

[bneradt]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d56432c43 Fix Findunwind.cmake on RHEL (#11001)
9d56432c43 is described below

commit 9d56432c43429e60bcfdc4a30b6aff51cc32db55
Author: Phong Nguyen <p...@nxp.io>
AuthorDate: Fri Feb 2 08:55:42 2024 -0800

    Fix Findunwind.cmake on RHEL (#11001)
    
    Fix change in #10811 intended for Ubuntu that caused build issues on RHEL.
---
 cmake/Findunwind.cmake | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmake/Findunwind.cmake b/cmake/Findunwind.cmake
index b192ccde8f..e1b2530b8d 100644
--- a/cmake/Findunwind.cmake
+++ b/cmake/Findunwind.cmake
@@ -28,14 +28,17 @@
 #     unwind::unwind
 #
 
+find_library(unwind_LIBRARY NAMES unwind)
 find_library(unwind_ptrace_LIBRARY NAMES unwind-ptrace)
 find_library(unwind_generic_LIBRARY NAMES unwind-generic)
-find_path(unwind_INCLUDE_DIR NAMES libunwind.h)
+find_path(unwind_INCLUDE_DIR NAMES libunwind.h libunwind/libunwind.h)
 
-mark_as_advanced(unwind_FOUND unwind_LIBRARY unwind_INCLUDE_DIR)
+mark_as_advanced(unwind_FOUND unwind_LIBRARY unwind_ptrace_LIBRARY 
unwind_generic_LIBRARY unwind_INCLUDE_DIR)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(unwind REQUIRED_VARS unwind_LIBRARY 
unwind_INCLUDE_DIR)
+find_package_handle_standard_args(
+  unwind REQUIRED_VARS unwind_LIBRARY unwind_ptrace_LIBRARY 
unwind_generic_LIBRARY unwind_INCLUDE_DIR
+)
 
 if(unwind_FOUND)
   set(unwind_INCLUDE_DIRS ${unwind_INCLUDE_DIR})
@@ -44,5 +47,7 @@ endif()
 if(unwind_FOUND AND NOT TARGET unwind::unwind)
   add_library(unwind::unwind INTERFACE IMPORTED)
   target_include_directories(unwind::unwind INTERFACE ${unwind_INCLUDE_DIRS})
-  target_link_libraries(unwind::unwind INTERFACE "${unwind_ptrace_LIBRARY}" 
"${unwind_generic_LIBRARY}")
+  target_link_libraries(
+    unwind::unwind INTERFACE "${unwind_ptrace_LIBRARY}" 
"${unwind_generic_LIBRARY}" "${unwind_LIBRARY}"
+  )
 endif()