From 0aacf62dd73513e629e47507684ef2dc59bc73b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <muffgaga@gmail.com>
Date: Fri, 14 Jun 2019 13:23:44 +0200
Subject: [PATCH] Fix build with libunwind (fix up for ad1c78ab) (#759)
* cmake/FindUnwind.cmake used the wrong variable (caused by commit ad1c78ab)
* CMakeLists.txt seems to use wrong syntax for providing a compiler define
of `WITH_UNWIND` (used in `arbor/util/unwind.cpp`)
---
CMakeLists.txt | 2 +-
cmake/FindUnwind.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddce9394..83163769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,7 +281,7 @@ endif()
find_package(Unwind)
if(Unwind_FOUND)
target_link_libraries(arbor-private-deps INTERFACE Unwind::unwind)
- target_compile_definitions(arbor-private-deps ARB_WITH_UNWIND)
+ target_compile_definitions(arbor-private-deps INTERFACE WITH_UNWIND)
list(APPEND arbor_export_dependencies "Unwind")
endif()
diff --git a/cmake/FindUnwind.cmake b/cmake/FindUnwind.cmake
index a6ddd341..000f9dd6 100644
--- a/cmake/FindUnwind.cmake
+++ b/cmake/FindUnwind.cmake
@@ -34,7 +34,7 @@ if(NOT Unwind_FOUND)
PATH_SUFFIXES lib64 lib
)
- find_library(_unwind_library_target unwind-${libunwind_arch}
+ find_library(_unwind_library_target unwind-${_libunwind_arch}
HINTS ${Unwind_SEARCH_DIR}
PATH_SUFFIXES lib64 lib
)
--
GitLab