diff options
| -rw-r--r-- | cmake/ProjUtilities.cmake | 2 | ||||
| -rw-r--r-- | docs/source/development/cmake.rst | 15 | ||||
| -rw-r--r-- | man/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/projections/moll.cpp | 2 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 12 |
5 files changed, 20 insertions, 13 deletions
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake index 690336b2..f0853fe3 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -98,7 +98,7 @@ function(configure_proj_pc) list(APPEND EXTRA_LIBS -lole32 -lshell32) else() set(cxx_libs "${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}") - list(REMOVE_ITEM cxx_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES}) + list(REMOVE_ITEM cxx_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} nonempty) foreach(lib IN LISTS cxx_libs) list(APPEND EXTRA_LIBS "-l${lib}") endforeach() diff --git a/docs/source/development/cmake.rst b/docs/source/development/cmake.rst index 477b4f3b..d1bbf42c 100644 --- a/docs/source/development/cmake.rst +++ b/docs/source/development/cmake.rst @@ -5,23 +5,18 @@ Using PROJ in CMake projects ******************************************************************************** The recommended way to use the PROJ library in a CMake project is to -link to the imported library target ``${PROJ_LIBRARIES}`` provided by +link to the imported library target ``PROJ::proj`` provided by the CMake configuration which comes with the library. Typical usage is: .. code:: - find_package(PROJ) + find_package(PROJ CONFIG REQUIRED) - target_link_libraries(MyApp PRIVATE ${PROJ_LIBRARIES}) + target_link_libraries(MyApp PRIVATE PROJ::proj) -By adding the imported library target ``${PROJ_LIBRARIES}`` to the +By adding the imported library target ``PROJ::proj`` to the target link libraries, CMake will also pass the include directories to -the compiler. This requires that you use CMake version 2.8.11 or later. -If you are using an older version of CMake, then add - -.. code:: - - include_directories(${PROJ_INCLUDE_DIRS}) +the compiler. The CMake command ``find_package`` will look for the configuration in a number of places. The lookup can be adjusted for all packages by setting diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 031cde04..a27429a4 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -6,4 +6,4 @@ install(FILES man1/gie.1 man1/projinfo.1 man1/projsync.1 - DESTINATION share/man/man1) + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/src/projections/moll.cpp b/src/projections/moll.cpp index 87b38336..f8b52a5f 100644 --- a/src/projections/moll.cpp +++ b/src/projections/moll.cpp @@ -10,7 +10,7 @@ PROJ_HEAD(moll, "Mollweide") "\n\tPCyl, Sph"; PROJ_HEAD(wag4, "Wagner IV") "\n\tPCyl, Sph"; PROJ_HEAD(wag5, "Wagner V") "\n\tPCyl, Sph"; -#define MAX_ITER 10 +#define MAX_ITER 30 #define LOOP_TOL 1e-7 namespace { // anonymous namespace diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 1a290294..38dfc6a2 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -3599,6 +3599,18 @@ roundtrip 1 accept -2 -1 expect -201113.698641813 -124066.283433860 roundtrip 1 +accept 0.0 89.99 +expect 0.00 9050917.562466157600 +roundtrip 1 +accept 0.0 89.999 +expect 0.00 9050964.513822982088 +roundtrip 1 +accept 0.0 -89.99 +expect 0.0 -9050917.562466157600 +roundtrip 1 +accept 0.0 -89.999 +expect 0.00 -9050964.513822982088 +roundtrip 1 direction inverse accept 200 100 |