Merge pull request #265 from fridrich/v0.56.0-release

(0.56) fix build with libdwarf 2.x where the includes are in libdwarf-2 subdirectory

Author: pshipton

cmake/modules/FindLibDwarf.cmake

@@ -54,14 +54,24 @@ set(DWARF_H_DEFINITIONS)
 set(DWARF_H_FOUND false)
 set(DWARF_H_INCLUDE_DIRS)
 
-find_path(LIBDWARF_0_DWARF_H_INCLUDE_DIR "libdwarf-0/dwarf.h")
+find_path(LIBDWARF_2_DWARF_H_INCLUDE_DIR "libdwarf-2/dwarf.h")
 
-if(LIBDWARF_0_DWARF_H_INCLUDE_DIR)
-	list(APPEND DWARF_H_INCLUDE_DIRS "${LIBDWARF_0_DWARF_H_INCLUDE_DIR}")
-	list(APPEND DWARF_H_DEFINITIONS HAVE_LIBDWARF_0_DWARF_H)
+if(LIBDWARF_2_DWARF_H_INCLUDE_DIR)
+	list(APPEND DWARF_H_INCLUDE_DIRS "${LIBDWARF_2_DWARF_H_INCLUDE_DIR}")
+	list(APPEND DWARF_H_DEFINITIONS HAVE_LIBDWARF_2_DWARF_H)
 	set(DWARF_H_FOUND true)
 endif()
 
+if(NOT DWARF_H_FOUND)
+	find_path(LIBDWARF_0_DWARF_H_INCLUDE_DIR "libdwarf-0/dwarf.h")
+
+	if(LIBDWARF_0_DWARF_H_INCLUDE_DIR)
+		list(APPEND DWARF_H_INCLUDE_DIRS "${LIBDWARF_0_DWARF_H_INCLUDE_DIR}")
+		list(APPEND DWARF_H_DEFINITIONS HAVE_LIBDWARF_0_DWARF_H)
+		set(DWARF_H_FOUND true)
+	endif()
+endif()
+
 if(NOT DWARF_H_FOUND)
 	find_path(LIBDWARF_DWARF_H_INCLUDE_DIR "libdwarf/dwarf.h")
 
@@ -98,14 +108,24 @@ set(LIBDWARF_H_DEFINITIONS)
 set(LIBDWARF_H_FOUND false)
 set(LIBDWARF_H_INCLUDE_DIRS)
 
-find_path(LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR "libdwarf-0/libdwarf.h")
+find_path(LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR "libdwarf-2/libdwarf.h")
 
-if(LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR)
-	list(APPEND LIBDWARF_H_INCLUDE_DIRS "${LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR}")
-	list(APPEND LIBDWARF_H_DEFINITIONS HAVE_LIBDWARF_0_LIBDWARF_H)
+if(LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR)
+	list(APPEND LIBDWARF_H_INCLUDE_DIRS "${LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR}")
+	list(APPEND LIBDWARF_H_DEFINITIONS HAVE_LIBDWARF_2_LIBDWARF_H)
 	set(LIBDWARF_H_FOUND true)
 endif()
 
+if(NOT LIBDWARF_H_FOUND)
+	find_path(LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR "libdwarf-0/libdwarf.h")
+
+	if(LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR)
+		list(APPEND LIBDWARF_H_INCLUDE_DIRS "${LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR}")
+		list(APPEND LIBDWARF_H_DEFINITIONS HAVE_LIBDWARF_0_LIBDWARF_H)
+		set(LIBDWARF_H_FOUND true)
+	endif()
+endif()
+
 if(NOT LIBDWARF_H_FOUND)
 	find_path(LIBDWARF_LIBDWARF_H_INCLUDE_DIR "libdwarf/libdwarf.h")
 

ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp

@@ -31,25 +31,29 @@
 #include "ddr/scanner/dwarf/DwarfFunctions.hpp"
 #else /* defined(AIXPPC) || defined(OSX) */
 
-#if defined(HAVE_LIBDWARF_0_DWARF_H)
+#if defined(HAVE_LIBDWARF_2_DWARF_H)
+#include <libdwarf-2/dwarf.h>
+#elif defined(HAVE_LIBDWARF_0_DWARF_H) /* defined(HAVE_LIBDWARF_2_DWARF_H) */
 #include <libdwarf-0/dwarf.h>
 #elif defined(HAVE_LIBDWARF_DWARF_H) /* defined(HAVE_LIBDWARF_0_DWARF_H) */
 #include <libdwarf/dwarf.h>
 #elif defined(HAVE_DWARF_H) /* defined(HAVE_LIBDWARF_DWARF_H) */
 #include <dwarf.h>
 #else /* defined(HAVE_DWARF_H) */
-#error "Need libdwarf-0/dwarf.h, libdwarf/dwarf.h or dwarf.h"
-#endif /* defined(HAVE_LIBDWARF_0_DWARF_H) */
+#error "Need libdwarf-2/dwarf.h, libdwarf-0/dwarf.h, libdwarf/dwarf.h or dwarf.h"
+#endif /* defined(HAVE_LIBDWARF_2_DWARF_H) */
 
-#if defined(HAVE_LIBDWARF_0_LIBDWARF_H)
+#if defined(HAVE_LIBDWARF_2_LIBDWARF_H)
+#include <libdwarf-2/libdwarf.h>
+#elif defined(HAVE_LIBDWARF_0_LIBDWARF_H) /* defined(HAVE_LIBDWARF_2_LIBDWARF_H) */
 #include <libdwarf-0/libdwarf.h>
 #elif defined(HAVE_LIBDWARF_LIBDWARF_H) /* defined(HAVE_LIBDWARF_0_LIBDWARF_H) */
 #include <libdwarf/libdwarf.h>
 #elif defined(HAVE_LIBDWARF_H) /* defined(HAVE_LIBDWARF_LIBDWARF_H) */
 #include <libdwarf.h>
 #else /* defined(HAVE_LIBDWARF_H) */
-#error "Need libdwarf-0/libdwarf.h, libdwarf/libdwarf.h or libdwarf.h"
-#endif /* defined(HAVE_LIBDWARF_0_LIBDWARF_H) */
+#error "Need libdwarf-2/libdwarf.h, libdwarf-0/libdwarf.h, libdwarf/libdwarf.h or libdwarf.h"
+#endif /* defined(HAVE_LIBDWARF_2_LIBDWARF_H) */
 
 #endif /* defined(AIXPPC) || defined(OSX) */