mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-31 16:31:40 +01:00
e235329df8
https://github.com/hobu/hexer LAS and OGR hexagonal density and boundary surface generation.
69 lines
1.8 KiB
Diff
69 lines
1.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8f7678f..6adf4f1 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -122,6 +122,8 @@ endif(WIN32)
|
|
|
|
set(hexer_defines_h_in "${CMAKE_CURRENT_SOURCE_DIR}/hexer_defines.h.in")
|
|
set(hexer_defines_h "${CMAKE_CURRENT_BINARY_DIR}/include/hexer/hexer_defines.h")
|
|
+include(CheckIncludeFiles)
|
|
+check_include_files(execinfo.h HEXER_HAVE_EXECINFO_H)
|
|
configure_file(${hexer_defines_h_in} ${hexer_defines_h})
|
|
HEXER_ADD_INCLUDES("" "" ${hexer_defines_h})
|
|
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
|
|
diff --git a/apps/Utils.cpp b/apps/Utils.cpp
|
|
index 92d810b..058539f 100644
|
|
--- a/apps/Utils.cpp
|
|
+++ b/apps/Utils.cpp
|
|
@@ -44,7 +44,9 @@
|
|
#include <cxxabi.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/wait.h> // WIFEXITED, WEXITSTATUS
|
|
+#ifdef HEXER_HAVE_EXECINFO_H
|
|
#include <execinfo.h> // backtrace
|
|
+#endif
|
|
#include <dlfcn.h> // dladdr
|
|
#endif
|
|
|
|
@@ -600,11 +602,11 @@ double Utils::normalizeLongitude(double longitude)
|
|
return longitude;
|
|
}
|
|
|
|
-
|
|
std::vector<std::string> Utils::backtrace()
|
|
{
|
|
std::vector<std::string> lines;
|
|
#ifndef WIN32
|
|
+#ifdef HEXER_HAVE_EXECINFO_H
|
|
const int MAX_STACK_SIZE(100);
|
|
void* buffer[MAX_STACK_SIZE];
|
|
std::vector<std::string> prefixes;
|
|
@@ -657,10 +659,10 @@ std::vector<std::string> Utils::backtrace()
|
|
}
|
|
}
|
|
#endif
|
|
+#endif
|
|
return lines;
|
|
}
|
|
|
|
-
|
|
// Useful for debug on occasion.
|
|
std::string Utils::hexDump(const char *buf, size_t count)
|
|
{
|
|
diff --git a/hexer_defines.h.in b/hexer_defines.h.in
|
|
index ded9053..0cdab99 100644
|
|
--- a/hexer_defines.h.in
|
|
+++ b/hexer_defines.h.in
|
|
@@ -25,6 +25,11 @@
|
|
#cmakedefine HEXER_HAVE_GDAL
|
|
|
|
/*
|
|
+ * availability of execinfo and backtrace
|
|
+ */
|
|
+#cmakedefine HEXER_HAVE_EXECINFO_H
|
|
+
|
|
+/*
|
|
* Debug or Release build?
|
|
*/
|
|
#define HEXER_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
|