From f3fa2b0c6f547d6c595ae2e37b2a29f99d76a1b9 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns-jpl@users.noreply.github.com>
Date: Fri, 22 May 2020 13:18:37 -0700
Subject: [PATCH] Fix ISSI libname and data installation

---
 contrib/issi/components/ISSI/CMakeLists.txt    | 11 +++++++++--
 .../issi/components/ISSI/src/CMakeLists.txt    |  1 -
 .../ISSI/src/igrf_data/CMakeLists.txt          | 18 ------------------
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 contrib/issi/components/ISSI/src/CMakeLists.txt
 delete mode 100644 contrib/issi/components/ISSI/src/igrf_data/CMakeLists.txt

diff --git a/contrib/issi/components/ISSI/CMakeLists.txt b/contrib/issi/components/ISSI/CMakeLists.txt
index 10f2fa1..98d429c 100644
--- a/contrib/issi/components/ISSI/CMakeLists.txt
+++ b/contrib/issi/components/ISSI/CMakeLists.txt
@@ -8,12 +8,19 @@ add_library(issi SHARED
     src/polcal.c
     src/tecToPhase.c
     )
+set_target_properties(issi PROPERTIES
+    PREFIX ""
+    OUTPUT_NAME issi
+    SUFFIX .so)
 target_include_directories(issi PUBLIC include)
 
-add_subdirectory(src)
-
 InstallSameDir(
     issi
     __init__.py
     FR.py
     )
+
+file(RELATIVE_PATH relpath ${isce2_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+install(DIRECTORY src/igrf_data
+        DESTINATION ${ISCE2_PKG}/${relpath}
+        )
diff --git a/contrib/issi/components/ISSI/src/CMakeLists.txt b/contrib/issi/components/ISSI/src/CMakeLists.txt
deleted file mode 100644
index 61f2d84..0000000
--- a/contrib/issi/components/ISSI/src/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(igrf_data)
diff --git a/contrib/issi/components/ISSI/src/igrf_data/CMakeLists.txt b/contrib/issi/components/ISSI/src/igrf_data/CMakeLists.txt
deleted file mode 100644
index 714613b..0000000
--- a/contrib/issi/components/ISSI/src/igrf_data/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-InstallSameDir(
-    dgrf00.dat
-    dgrf45.dat
-    dgrf50.dat
-    dgrf55.dat
-    dgrf60.dat
-    dgrf65.dat
-    dgrf70.dat
-    dgrf75.dat
-    dgrf80.dat
-    dgrf85.dat
-    dgrf90.dat
-    dgrf95.dat
-    igrf05.dat
-    igrf05full.dat
-    igrf05s.dat
-    igrf10.dat
-    )