diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-22 22:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 22:43:23 +0100 |
| commit | b65e8ef7b29f19c6b4b4a49cf95766ec1f752491 (patch) | |
| tree | 9627a110931ebc2ed6f1670cbf86c58053437685 | |
| parent | cfb469501859c61cbda7f9217fb8161bdfca4892 (diff) | |
| parent | fe2a06e36556f1976d25b088760f2256997a3fd5 (diff) | |
| download | PROJ-b65e8ef7b29f19c6b4b4a49cf95766ec1f752491.tar.gz PROJ-b65e8ef7b29f19c6b4b4a49cf95766ec1f752491.zip | |
Merge pull request #813 from sebastic/install-nad-gtx
Also install .gtx files from proj-datumgrid.
| -rw-r--r-- | nad/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | nad/Makefile.am | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index 9858e055..904066f4 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -23,7 +23,8 @@ set(PROJ_DICTIONARY epsg # file(GLOB GSB_FILES *.gsb) -set(GRIDSHIFT_FILES ${GSB_FILES}) +file(GLOB GTX_FILES *.gtx) +set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES}) set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES} ) option(CONVERT_DATA "convert some ascii file to binary file for use in proj4" OFF) diff --git a/nad/Makefile.am b/nad/Makefile.am index 99d00da3..001b1b06 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -50,7 +50,7 @@ install-data-local: process-nad2bin else \ echo "nad2nad NADCON source files not present"; \ fi - @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \ + @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy \ $(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii $(NADPATH)/null \ $(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc $(NADPATH)/stpaul \ $(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN $(NADPATH)/WI $(NADPATH)/WO; do \ @@ -63,7 +63,7 @@ install-data-local: process-nad2bin check-local: process-nad2bin # Check if we are doing an out-of-tree build @if test ! -f epsg; then \ - for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \ + for gridfile in $(NADPATH)/*.gsb $(NADPATH)/*.gtx $(NADPATH)/ntv1_can.dat dummy ; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ cp $$gridfile .; \ fi; \ |