This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository proj.
commit 810d66dc13d824d4485437994a1aaf0e2349dd48 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Mar 4 20:27:06 2015 +0100 Imported Upstream version 4.9.1~rc5 --- CMakeLists.txt | 6 ++++++ cmake/CMakeLists.txt | 4 ++-- cmake/project-config-version.cmake.in | 6 +++--- cmake/project-config.cmake.in | 29 ++++++++++++++++------------- jniwrap/doxygen.cfg | 2 +- nad/testvarious | 25 ++----------------------- nad/tv_out.dist | 17 ++--------------- src/CMakeLists.txt | 6 ++++++ src/pj_release.c | 2 +- 9 files changed, 39 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f30b1a6..6b3734b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,12 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set (CMAKE_BUILD_TYPE Release) endif () +if (MSVC OR CMAKE_CONFIGURATION_TYPES) + # For multi-config systems and for Visual Studio, the debug version of + # the library has _d appended. + set (CMAKE_DEBUG_POSTFIX _d) +endif () + option(PROJ4_TESTS "Enable build of collection of PROJ4 tests" ON) boost_report_value(PROJ4_TESTS) if(PROJ4_TESTS) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index dcb0a61..742da0e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -3,14 +3,14 @@ # path to the root from there. (Note that the whole install tree can # be relocated.) if (NOT WIN32) - set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_INTERN_NAME}") + set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") set (PROJECT_ROOT_DIR "../../..") else () set (INSTALL_CMAKE_DIR "cmake") set (PROJECT_ROOT_DIR "..") endif () -string(TOLOWER "${PROJECT_INTERN_NAME}" PROJECT_NAME_LOWER) +string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) configure_file (project-config.cmake.in project-config.cmake @ONLY) configure_file (project-config-version.cmake.in project-config-version.cmake @ONLY) diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in index 5d57ee1..ce2820c 100644 --- a/cmake/project-config-version.cmake.in +++ b/cmake/project-config-version.cmake.in @@ -1,16 +1,16 @@ -# Version checking for @PROJECT_INTERN_NAME@ +# Version checking for @PROJECT_NAME@ set (PACKAGE_VERSION "@PROJ_VERSION@") set (PACKAGE_VERSION_MAJOR "@PROJ_VERSION_MAJOR@") set (PACKAGE_VERSION_MINOR "@PROJ_VERSION_MINOR@") set (PACKAGE_VERSION_PATCH "@PROJ_VERSION_PATCH@") -if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_INTERN_NAME@") +if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@") # Check package name (in particular, because of the way cmake finds # package config files, the capitalization could easily be "wrong"). # This is necessary to ensure that the automatically generated # variables, e.g., <package>_FOUND, are consistently spelled. - set (REASON "package = @PROJECT_INTERN_NAME@, NOT ${PACKAGE_FIND_NAME}") + set (REASON "package = @PROJECT_NAME@, NOT ${PACKAGE_FIND_NAME}") set (PACKAGE_VERSION_UNSUITABLE TRUE) elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@)) diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 6110dc6..9a52b3b 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in @@ -1,28 +1,31 @@ -# Configure @PROJECT_INTERN_NAME@ +# Configure @PROJECT_NAME@ # # Set -# @PROJECT_INTERN_NAME@_FOUND = 1 -# @PROJECT_INTERN_NAME@_INCLUDE_DIRS = /usr/local/include -# @PROJECT_INTERN_NAME@_LIBRARIES = proj -# @PROJECT_INTERN_NAME@_LIBRARY_DIRS = /usr/local/lib -# @PROJECT_INTERN_NAME@_BINARY_DIRS = /usr/local/bin -# @PROJECT_INTERN_NAME@_VERSION = 4.9.1 (for example) +# @PROJECT_NAME@_FOUND = 1 +# @PROJECT_NAME@_INCLUDE_DIRS = /usr/local/include +# @PROJECT_NAME@_LIBRARIES = proj +# @PROJECT_NAME@_LIBRARY_DIRS = /usr/local/lib +# @PROJECT_NAME@_BINARY_DIRS = /usr/local/bin +# @PROJECT_NAME@_VERSION = 4.9.1 (for example) message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") -# @PROJECT_INTERN_NAME@_VERSION is set by version file +# @PROJECT_NAME@_VERSION is set by version file message (STATUS - "@PROJECT_INTERN_NAME@ configuration, version ${@PROJECT_INTERN_NAME@_VERSION}") + "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") # Tell the user project where to find our headers and libraries get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) -set (@PROJECT_INTERN_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@") -set (@PROJECT_INTERN_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@") -set (@PROJECT_INTERN_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@") +set (@PROJECT_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@") +set (@PROJECT_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@") +set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@") -set (@PROJECT_INTERN_NAME@_LIBRARIES proj) +set (@PROJECT_NAME@_LIBRARIES proj) # Read in the exported definition of the library include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake") unset (_ROOT) unset (_DIR) + +# For backward compatibility with old releases of libgeotiff +set (@PROJECT_NAME@_INCLUDE_DIR ${@PROJECT_NAME@_INCLUDE_DIRS}) diff --git a/jniwrap/doxygen.cfg b/jniwrap/doxygen.cfg index 12dc475..a46a8bb 100644 --- a/jniwrap/doxygen.cfg +++ b/jniwrap/doxygen.cfg @@ -894,7 +894,7 @@ HTML_COLORSTYLE_GAMMA = 80 # page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # files or namespaces will be aligned in HTML using tables. If set to diff --git a/nad/testvarious b/nad/testvarious index 92cb6bd..a128eb5 100755 --- a/nad/testvarious +++ b/nad/testvarious @@ -277,27 +277,6 @@ $EXE +proj=latlong +R=5 \ 0 60.0 0 -60.0 EOF -echo "Test healpix inverse projection on sphere" >> ${OUT} -$EXE +proj=latlong +a=1 +lon_0=0 \ - +to +proj=healpix +a=1 +lon_0=0 -f '%.'5'f' -I\ - -E >>${OUT} <<EOF -0 0.7853981633974483 --1.5707963267948966 0 -EOF -$EXE +proj=latlong +a=5 \ - +to +proj=healpix +a=5 -f '%.'5'f' -I\ - -E >>${OUT} <<EOF -0.0 0.0 -0.0 3.9269908169872414 -0.0 -3.9269908169872414 -7.853981633974483 0.0 --7.853981633974483 0.0 --15.707963267948966 0.0 --11.780972450961723 7.853981633974483 --11.780972450961723 -7.853981633974483 -1.437378399445537 5.364369216432778 -1.437378399445537 -5.364369216432778 -EOF echo "Test healpix forward projection on ellipsoid" >> ${OUT} $EXE +proj=latlong +a=1 +lon_0=0 +ellps=WGS84 \ +to +proj=healpix +a=1 +lon_0=0 +ellps=WGS84 -f '%.'5'f' \ @@ -589,7 +568,7 @@ EOF echo "##############################################################" >> ${OUT} echo "Test MGI datum gives expected results (#207)" >> ${OUT} # -$EXE -f '%.9f' \ +$EXE -f '%.7f' \ +proj=latlong +datum=WGS84 \ +to +init=epsg:31284 \ -E >>${OUT} <<EOF @@ -635,7 +614,7 @@ EOF echo "##############################################################" >> ${OUT} echo "Test qsc" >> ${OUT} # -$EXE -f '%.13f' \ +$EXE -f '%.7f' \ +proj=latlong +datum=WGS84 \ +to +proj=qsc +datum=WGS84 +no_defs \ -E >>${OUT} <<EOF diff --git a/nad/tv_out.dist b/nad/tv_out.dist index b0226f4..d36ab5b 100644 --- a/nad/tv_out.dist +++ b/nad/tv_out.dist @@ -105,19 +105,6 @@ Test healpix forward projection on sphere -180 -90.0 -19.63495 -7.85398 0.00000 0 60.0 1.43738 5.36437 0.00000 0 -60.0 1.43738 -5.36437 0.00000 -Test healpix inverse projection on sphere -0 0.7853981633974483 0.00000 41.81031 0.00000 --1.5707963267948966 0 -90.00000 0.00000 0.00000 -0.0 0.0 0.00000 0.00000 0.00000 -0.0 3.9269908169872414 0.00000 41.81031 0.00000 -0.0 -3.9269908169872414 0.00000 -41.81031 0.00000 -7.853981633974483 0.0 90.00000 0.00000 0.00000 --7.853981633974483 0.0 -90.00000 0.00000 0.00000 --15.707963267948966 0.0 -180.00000 0.00000 0.00000 --11.780972450961723 7.853981633974483 -180.00000 90.00000 0.00000 --11.780972450961723 -7.853981633974483 -180.00000 -90.00000 0.00000 -1.437378399445537 5.364369216432778 0.00000 60.00000 0.00000 -1.437378399445537 -5.364369216432778 0.00000 -60.00000 0.00000 Test healpix forward projection on ellipsoid 0 41.937853904844985 0.00000 0.78452 0.00000 -90 0 -1.56904 0.00000 0.00000 @@ -291,7 +278,7 @@ Test inverse handling 10 20 -1384841.19 7581707.88 0.00 ############################################################## Test MGI datum gives expected results (#207) -16.33 48.20 595710.373210150 5357598.464575459 -44.495108472 +16.33 48.20 595710.3732102 5357598.4645755 -44.4951085 ############################################################## Test omerc sensitivity with locations 90d from origin(#114) 56.958381652832 72.8798 -9985.16336453 -227.67701050 0.00000000 @@ -310,7 +297,7 @@ Test omerc differences between poles (#190) 163 -80 -11163496.121 397796.828 0.000 ############################################################## Test qsc -13 -10 2073986.9490880956873 -1680858.2722242795862 0.0000000000000 +13 -10 2073986.9490881 -1680858.2722243 0.0000000 2073986.94908809568733 -1680858.27222427958623 13.0000000000000 -10.0000000000000 0.0000000000000 ############################################################## Test bug 229 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c84fab..aba5b4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,3 +37,9 @@ endif(BUILD_GEOD) if(BUILD_NAD2BIN) include(bin_nad2bin.cmake) endif(BUILD_NAD2BIN) + +if (MSVC OR CMAKE_CONFIGURATION_TYPES) + # Add _d suffix for your debug versions of the tools + set_target_properties (cs2cs binproj geod nad2bin PROPERTIES + DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) +endif () diff --git a/src/pj_release.c b/src/pj_release.c index 7495673..f60b220 100644 --- a/src/pj_release.c +++ b/src/pj_release.c @@ -2,7 +2,7 @@ #include <projects.h> -char const pj_release[]="Rel. 4.9.1, 17 February 2015"; +char const pj_release[]="Rel. 4.9.1, 04 March 2015"; const char *pj_get_release() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel