diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-04 14:48:52 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-04 20:30:12 +0100 |
| commit | d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8 (patch) | |
| tree | d5f76a37e4cadc6fff0e1b86a487209aa5057bbb /cmake | |
| parent | 2e6dde7a7eae34b8f93c078480db077891f03068 (diff) | |
| download | PROJ-d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8.tar.gz PROJ-d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8.zip | |
Remove all traces of nad2bin and nad2nad
The source material for the default grids used by
PROJ has been moved to the proj-datumgrid repository. For that
reason it is no longer necessary to include the nad2bin program
in the PROJ repository and source distribution. From now on the
nad2bin application will be kept in the proj-datumgrid repo.
Previously the null grid was generated by running nad2bin on the
null.lla file. Since nad2bin is no longer available null.lla has
been replaced by its binary counterpart null. This file will be
distributed and installed alongside PROJ.
Build scripts and documenation has been adjusted so that nad2bin
is not mentioned anywhere. Additionally all references to nad2nad
has been removed as well. nad2nad has not been part of the PROJ
distribution for quite some time so this has been long overdue.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjUtilities.cmake | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake index 6969a664..72373719 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -111,57 +111,4 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME) endif() set(${OUTPUT_NAME} ${TARGET_NAME}${SUFFIX} PARENT_SCOPE) -endfunction() - - -# -# conversion from lla name to lla convert name ( without lla extension) -# - -function(proj_lla_output_name LLA_INPUT_NAME LLA_OUTPUT_NAME ) - get_filename_component(filename ${LLA_INPUT_NAME} NAME_WE) - get_filename_component(pathname ${LLA_INPUT_NAME} PATH) - set(${LLA_OUTPUT_NAME} ${pathname}/${filename} PARENT_SCOPE) - set(${LLA_OUTPUT_NAME} ${pathname}/${filename} PARENT_SCOPE) -endfunction() - -function(proj_lla_target_name LLA_INPUT_NAME LLA_TARGET ) - get_filename_component(filename ${LLA_INPUT_NAME} NAME_WE) - set(${LLA_TARGET} ${filename} PARENT_SCOPE) -endfunction() - -# -# in place conversion of lla file to gsb -# - -function(proj_convert_grid_lla2gsb GRID_DIRECTORY) - set(NAD2BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - set(NAD2BIN_PATH ${NAD2BIN_DIR}/nad2bin${CMAKE_EXECUTABLE_SUFFIX}) - file(TO_NATIVE_PATH ${NAD2BIN_PATH} NAD2BIN_EXE) - file(GLOB LLA_FILES ${${GRID_DIRECTORY}}/*.lla) - foreach(LLA ${LLA_FILES} ) - proj_lla_output_name(${LLA} DEST_FILE) - file(TO_NATIVE_PATH ${DEST_FILE} DEST) - proj_lla_target_name(${LLA} LLA_TARGET) - if(NOT EXISTS ${DEST}) - add_custom_target( ${LLA_TARGET} ALL - COMMAND ${NAD2BIN_EXE} ${DEST} "<" ${LLA} - DEPENDS nad2bin ) - endif(NOT EXISTS ${DEST}) - endforeach(LLA) -endfunction() - -# -# add lla output list to an existing file list -# - -function(proj_append_lla_output_file LLA_INPUT_FILE FILE_LIST) - set(LIST_OUT ${${FILE_LIST}}) - foreach(LLA ${${LLA_INPUT_FILE}} ) - proj_lla_output_name(${LLA} DEST_FILE) - file(TO_NATIVE_PATH ${DEST_FILE} DEST) - set(LIST_OUT ${LIST_OUT} ${DEST_FILE} ) - endforeach(LLA ${LLA_INPUT_FILE}) - set(${FILE_LIST} ${LIST_OUT} PARENT_SCOPE) -endfunction() - +endfunction()
\ No newline at end of file |
