diff options
| author | Howard Butler <howard@hobu.co> | 2014-09-13 23:29:47 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2014-09-13 23:29:47 +0000 |
| commit | 1797577f220f972f769c90d392da9d8cc96fe1d8 (patch) | |
| tree | 2371c282296a0b71c280b455702dae7ca10bb38e /nad | |
| parent | 0864e178e2d9e72af4bdf93794c8e04cb336ee80 (diff) | |
| download | PROJ-1797577f220f972f769c90d392da9d8cc96fe1d8.tar.gz PROJ-1797577f220f972f769c90d392da9d8cc96fe1d8.zip | |
More CMake tweaks #243
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2540 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'nad')
| -rw-r--r-- | nad/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | nad/Makefile.am | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index fccbbce7..e95b0cd8 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -2,8 +2,7 @@ # files containing dictionnary of useful projection # -set(PROJ_DICTIONNARY proj_def.dat - epsg +set(PROJ_DICTIONARY epsg esri world esri.extra @@ -21,7 +20,7 @@ set(PROJ_DICTIONNARY proj_def.dat file(GLOB GSB_FILES *.gsb) set(GRIDSHIFT_FILES ${GSB_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) message(ERROR " you need to compile nad2bin exe in order to convert data file" ) @@ -36,12 +35,11 @@ endif(CONVERT_DATA AND nad2bin) # #install # -set(ALL_DATA_FILE ${PROJ_DICTIONNARY} +set(ALL_DATA_FILE ${PROJ_DICTIONARY} ${GRIDSHIFT_FILES} ${GEOID_FILES}) install(FILES ${ALL_DATA_FILE} - DESTINATION ${DATADIR} - PERMISSIONS WORLD_READ WORLD_WRITE WORLD_EXECUTE) + DESTINATION ${DATADIR}) # # test diff --git a/nad/Makefile.am b/nad/Makefile.am index 504b9947..f8ffae8e 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -11,12 +11,12 @@ TESTVARIOUS = ./testvarious TESTDATUMFILE = ./testdatumfile TESTIGN = ./testIGNF -pkgdata_DATA = GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri \ +pkgdata_DATA = GL27 nad.lst nad27 nad83 world epsg esri \ esri.extra other.extra \ 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 \ + test27 test83 world epsg esri tv_out.dist \ testvarious testdatumfile testntv2 ntv2_out.dist \ esri.extra other.extra \ CH IGNF testIGNF proj_outIGNF.dist \ |