Merge pull request #180 from octurion/cmake-vivify

Vivify CMake fixes
morganstanley · Jul 28, 2024 · 6fb63e3 · 6fb63e3
2 parents cdfcf85 + bcd5e83
commit 6fb63e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/vivify/CMakeLists.txt b/vivify/CMakeLists.txt
@@ -27,18 +27,24 @@ if(NOT DWARF_H_FOUND)
   message(WARNING "skipping vivify build. dwarf.h not found!!!")
   return()
 endif()
+
+set(CMAKE_REQUIRED_DEFINITIONS -DPACKAGE -DPACKAGE_VERSION)
 check_include_file("bfd.h" BFD_H_FOUND)
+set(CMAKE_REQUIRED_DEFINITIONS)
 if(NOT BFD_H_FOUND)
   message(WARNING "skipping vivify build. bfd.h not found!!!")
   return()
 endif()
+
 find_library(LIBELF_FOUND elf)
 if(NOT LIBELF_FOUND)
   message(WARNING "skipping vivify build. libelf not found!!!")
   return()
 endif()
 
+set(CMAKE_REQUIRED_DEFINITIONS -DPACKAGE -DPACKAGE_VERSION)
 check_symbol_exists(bfd_section_flags "bfd.h" HAVE_BFD_SECTION_FLAGS)
+set(CMAKE_REQUIRED_DEFINITIONS)
 
 include_directories(include)
 file(GLOB_RECURSE lib_vivify_headers lib/vivify/*.[hH])

diff --git a/vivify/demo/StackUnwind.C b/vivify/demo/StackUnwind.C
@@ -18,6 +18,7 @@
 #include <libunwind-x86_64.h>
 
 #include <cstdlib>
+#include <stdexcept>
 #include <sstream>
 #include <algorithm>