From 990417c00094dc5aa74a26d87820288aed8b2a1a Mon Sep 17 00:00:00 2001
From: "James.Hester" <jxh@ansto.gov.au>
Date: Sun, 30 Dec 2018 10:07:26 +1100
Subject: [PATCH] Teach terrafit about rectified height files.
---
src/Prep/TerraFit/CMakeLists.txt | 3 +++
src/Prep/TerraFit/terrafit.cc | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Prep/TerraFit/CMakeLists.txt b/src/Prep/TerraFit/CMakeLists.txt
index 1337d3b0..bcd7e752 100644
--- a/src/Prep/TerraFit/CMakeLists.txt
+++ b/src/Prep/TerraFit/CMakeLists.txt
@@ -1,8 +1,11 @@
add_executable(terrafit terrafit.cc)
+include_directories(${PROJECT_SOURCE_DIR}/src/Lib/terragear)
+
target_link_libraries(terrafit
Array Terra
+ 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 4743133c..6ecce7d5 100644
--- a/src/Prep/TerraFit/terrafit.cc
+++ b/src/Prep/TerraFit/terrafit.cc
@@ -239,7 +239,7 @@ void walk_path(const SGPath& path) {
return;
}
- if ((path.lower_extension() == "arr") || (path.complete_lower_extension() == "arr.gz")) {
+ if ((path.lower_extension() == "arr") || (path.complete_lower_extension() == "arr.rectified.gz")) {
SG_LOG(SG_GENERAL, SG_DEBUG, "will queue " << path);
queue_fit_file(path);
} else if (path.isDir()) {