diff options
| author | Howard Butler <howard@hobu.co> | 2014-09-13 23:21:15 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2014-09-13 23:21:15 +0000 |
| commit | 0864e178e2d9e72af4bdf93794c8e04cb336ee80 (patch) | |
| tree | 959c51122fb86bf336d8bd603b96261b6562ec57 /nad | |
| parent | c3e44847478180353cef9dfddd735b58092b2f91 (diff) | |
| download | PROJ-0864e178e2d9e72af4bdf93794c8e04cb336ee80.tar.gz PROJ-0864e178e2d9e72af4bdf93794c8e04cb336ee80.zip | |
CMake fixups #243
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2539 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'nad')
| -rw-r--r-- | nad/CMakeLists.txt | 34 | ||||
| -rw-r--r-- | nad/Makefile.am | 8 |
2 files changed, 19 insertions, 23 deletions
diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index 8c0a0e8a..fccbbce7 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -2,25 +2,25 @@ # files containing dictionnary of useful projection # -set(PROJ_DICTIONNARY proj_def.dat +set(PROJ_DICTIONNARY proj_def.dat epsg esri world esri.extra other.extra - IGNF + IGNF nad27 GL27 nad83 nad.lst ) - + # # gridshift file -# +# file(GLOB GSB_FILES *.gsb) set(GRIDSHIFT_FILES ${GSB_FILES}) -set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES} +set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES} ntv1_can.dat) option(CONVERT_DATA "convert some ascii file to binary file for use in proj4" OFF) if(CONVERT_DATA AND nad2bin) @@ -34,22 +34,18 @@ endif(CONVERT_DATA AND nad2bin) # -#install +#install # -set(ALL_DATA_FILE ${PROJ_DICTIONNARY} - ${GRIDSHIFT_FILES} +set(ALL_DATA_FILE ${PROJ_DICTIONNARY} + ${GRIDSHIFT_FILES} ${GEOID_FILES}) -if(NOT BUILD_FRAMEWORKS_AND_BUNDLE) - install(FILES ${ALL_DATA_FILE} - DESTINATION ${DATADIR} - PERMISSIONS WORLD_READ WORLD_WRITE WORLD_EXECUTE) -else() - set(PROJ_RESOURCES ${PROJ_RESOURCES} ${ALL_DATA_FILE}) -endif(NOT BUILD_FRAMEWORKS_AND_BUNDLE) - -# -# test -# +install(FILES ${ALL_DATA_FILE} + DESTINATION ${DATADIR} + PERMISSIONS WORLD_READ WORLD_WRITE WORLD_EXECUTE) + +# +# test +# set(CS2CS_BIN "cs2cs") set(PROJ_BIN "proj") proj_add_test_script_sh("test27" PROJ_BIN ) diff --git a/nad/Makefile.am b/nad/Makefile.am index 3ac32774..504b9947 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -13,14 +13,14 @@ TESTIGN = ./testIGNF pkgdata_DATA = GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri \ esri.extra other.extra \ - CH IGNF + CH IGNF EXTRA_DIST = GL27 nad.lst nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \ proj_def.dat test27 test83 world epsg esri tv_out.dist \ testvarious testdatumfile testntv2 ntv2_out.dist \ esri.extra other.extra \ CH IGNF testIGNF proj_outIGNF.dist \ - makefile.vc + makefile.vc CMakeLists.txt process-nad2bin: @if [ -f null.lla -a ! -f null ] || [ -f conus.lla -a ! -f conus ] ; then \ @@ -29,7 +29,7 @@ process-nad2bin: echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \ ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \ done; \ - fi + fi install-data-local: process-nad2bin $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @@ -44,7 +44,7 @@ install-data-local: process-nad2bin done @if [ ! -f conus.lla ] ; then \ echo "nad2nad NADCON source files not present"; \ - fi + fi @for gridfile in *.gsb ntv1_can.dat dummy ; do \ if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/$$gridfile; \ |