From e8b87fcf74b2417fbc1f89f06c762102034432c6 Mon Sep 17 00:00:00 2001
From: "James.Hester" <jxh@ansto.gov.au>
Date: Mon, 31 Dec 2018 10:12:49 +1100
Subject: [PATCH] Fix includes for full terragear tool suite, allow arr.gz
again for terrafit.
---
src/Airports/GenAirports850/CMakeLists.txt | 1 +
src/Prep/DemChop/CMakeLists.txt | 3 +++
src/Prep/TerraFit/terrafit.cc | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Airports/GenAirports850/CMakeLists.txt b/src/Airports/GenAirports850/CMakeLists.txt
index 67722dff..a699042d 100644
--- a/src/Airports/GenAirports850/CMakeLists.txt
+++ b/src/Airports/GenAirports850/CMakeLists.txt
@@ -1,5 +1,6 @@
include_directories(${GDAL_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/src/Lib)
+include_directories(${PROJECT_SOURCE_DIR}/src/Lib/terragear)
add_executable(genapts850
airport.hxx airport.cxx
diff --git a/src/Prep/DemChop/CMakeLists.txt b/src/Prep/DemChop/CMakeLists.txt
index 00d0ea37..1d29e622 100644
--- a/src/Prep/DemChop/CMakeLists.txt
+++ b/src/Prep/DemChop/CMakeLists.txt
@@ -1,3 +1,4 @@
+include_directories(${PROJECT_SOURCE_DIR}/src/Lib/terragear)
add_executable(demchop demchop.cxx)
@@ -49,6 +50,7 @@ endif(TIFF_FOUND)
add_executable(fillvoids fillvoids.cxx)
target_link_libraries(fillvoids
Array
+ terragear
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
@@ -58,6 +60,7 @@ install(TARGETS fillvoids RUNTIME DESTINATION bin)
add_executable(testassem testassem.cxx)
target_link_libraries(testassem
Array
+ terragear
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
diff --git a/src/Prep/TerraFit/terrafit.cc b/src/Prep/TerraFit/terrafit.cc
index d84d671b..43f5cdf2 100644
--- a/src/Prep/TerraFit/terrafit.cc
+++ b/src/Prep/TerraFit/terrafit.cc
@@ -239,7 +239,8 @@ void walk_path(const SGPath& path) {
return;
}
- if ((path.lower_extension() == "arr") || (path.complete_lower_extension() == "arr.rectified.gz")) {
+ if ((path.lower_extension() == "arr") || (path.complete_lower_extension() == "arr.rectified.gz") ||
+ (path.complete_lower_extension() == "arr.gz")) {
SG_LOG(SG_GENERAL, SG_DEBUG, "will queue " << path);
queue_fit_file(path);
} else if (path.isDir()) {