diff options
| author | Howard Butler <howard@hobu.co> | 2016-09-02 11:41:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 11:41:48 -0500 |
| commit | a95b464a1d2db1d8df32154e0145f00575c3c2fc (patch) | |
| tree | 4fd10f50db3234e7614ec2552ab3762923d2ba12 | |
| parent | 82d0797275be73a50e72016e532efaffdba71bf3 (diff) | |
| parent | 91a8099b881e81f01e695b97b43187b6a111c9f2 (diff) | |
| download | PROJ-a95b464a1d2db1d8df32154e0145f00575c3c2fc.tar.gz PROJ-a95b464a1d2db1d8df32154e0145f00575c3c2fc.zip | |
Merge pull request #410 from OSGeo/cmake-fix-convert-dtata
fix #407 -- nad2bin and convertdata interaction in cmake
| -rw-r--r-- | nad/CMakeLists.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index a9b08cbd..7cd25c21 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -24,14 +24,16 @@ set(GRIDSHIFT_FILES ${GSB_FILES}) set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES} ) 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" ) -else(CONVERT_DATA AND nad2bin) - set(LLA_GRID_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - proj_convert_grid_lla2gsb(LLA_GRID_DIR) - file(GLOB LLA_FILES *.lla) - proj_append_lla_output_file(LLA_FILES GRIDSHIFT_FILES) -endif(CONVERT_DATA AND nad2bin) +if(CONVERT_DATA) + if (BUILD_NAD2BIN) + set(LLA_GRID_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + proj_convert_grid_lla2gsb(LLA_GRID_DIR) + file(GLOB LLA_FILES *.lla) + proj_append_lla_output_file(LLA_FILES GRIDSHIFT_FILES) + else() + message(ERROR " you need to compile nad2bin exe in order to convert data file" ) + endif(BUILD_NAD2BIN) +endif(CONVERT_DATA) # |