-
Notifications
You must be signed in to change notification settings - Fork 6.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[geographiclib] Update to 1.50.1 #11687
Closed
NancyLi1013
wants to merge
5
commits into
microsoft:master
from
NancyLi1013:dev/NancyLi10293/update-geographiclib
Closed
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ded6b13
[geographiclib] Update to 1.50.1
29482a4
Merge remote-tracking branch 'origin/master' into dev/NancyLi10293/up…
BillyONeal 179953a
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
21d0271
Remove usage
cd34295
Merge branch 'dev/NancyLi10293/update-geographiclib' of https://githu…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: geographiclib | ||
| Version: 1.47-patch1-11 | ||
| Version: 1.50.1 | ||
| Homepage: https://sourceforge.net/projects/geographiclib/ | ||
| Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems. | ||
| Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,12 @@ | ||
| diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in | ||
| index 1f207b8..d469658 100644 | ||
| --- a/cmake/project-config-version.cmake.in | ||
| +++ b/cmake/project-config-version.cmake.in | ||
| @@ -22,9 +22,9 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR | ||
| # Reject if there's a mismatch in MSVC compiler versions | ||
| # set (REASON "_MSC_VER = @MSVC_VERSION@") | ||
| # set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| -elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@") | ||
| +elseif (NOT CMAKE_CROSSCOMPILING STREQUAL FALSE) | ||
| # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} | ||
| - set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") | ||
| + set (REASON "cross-compiling = FALSE") | ||
| set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| elseif (CMAKE_CROSSCOMPILING AND | ||
| NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 4a9ec4e..57bf448 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -46,6 +46,7 @@ set (LIBVERSION_API 19) | ||
| set (LIBVERSION_BUILD 19.0.1) | ||
| string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) | ||
| string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) | ||
| +set(PROJECT_NAME_LOWER ${PROJECT_NAME}) | ||
|
|
||
| cmake_minimum_required (VERSION 3.1.0) # This version was released 2014-12-15 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,66 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index e79923b..3448362 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -437,13 +437,13 @@ set_property (GLOBAL PROPERTY USE_FOLDERS ON) | ||
| # The list of subdirectories to process | ||
| add_subdirectory (src) | ||
| add_subdirectory (include/GeographicLib) | ||
| -add_subdirectory (tools) | ||
| -add_subdirectory (man) | ||
| -add_subdirectory (doc) | ||
| -add_subdirectory (js) | ||
| -add_subdirectory (matlab) | ||
| -add_subdirectory (python/geographiclib) | ||
| -add_subdirectory (examples) | ||
| +# add_subdirectory (tools) | ||
| +# add_subdirectory (man) | ||
| +# add_subdirectory (doc) | ||
| +# add_subdirectory (js) | ||
| +# add_subdirectory (matlab) | ||
| +# add_subdirectory (python/geographiclib) | ||
| +# add_subdirectory (examples) | ||
| if (MSVC AND BUILD_NETGEOGRAPHICLIB) | ||
| if (GEOGRAPHICLIB_PRECISION EQUAL 2) | ||
| set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) | ||
| diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt | ||
| index 0c8ad64..7dc4096 100644 | ||
| --- a/cmake/CMakeLists.txt | ||
| +++ b/cmake/CMakeLists.txt | ||
| @@ -14,10 +14,10 @@ configure_file (project-config.cmake.in | ||
| configure_file (project-config-version.cmake.in | ||
| "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY) | ||
| export (TARGETS | ||
| - ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS} | ||
| + ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} | ||
| FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") | ||
| export (TARGETS | ||
| - ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} ${TOOLS} | ||
| + ${PROJECT_SHARED_LIBRARIES} ${PROJECT_STATIC_LIBRARIES} | ||
| NAMESPACE ${PROJECT_NAME}:: | ||
| FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") | ||
|
|
||
| diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in | ||
| index 3b3b9e8..bc2ce19 100644 | ||
| --- a/cmake/project-config-version.cmake.in | ||
| +++ b/cmake/project-config-version.cmake.in | ||
| @@ -18,10 +18,10 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR | ||
| # since a multi-architecture library is built for that platform). | ||
| set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@") | ||
| set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| -elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") | ||
| +#elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") | ||
| # Reject if there's a mismatch in MSVC compiler versions | ||
| - set (REASON "_MSC_VER = @MSVC_VERSION@") | ||
| - set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| +# set (REASON "_MSC_VER = @MSVC_VERSION@") | ||
| +# set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@") | ||
| # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} | ||
| set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 30875dd..4a9ec4e 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -508,13 +508,13 @@ set_property (GLOBAL PROPERTY USE_FOLDERS ON) | ||
| # The list of subdirectories to process | ||
| add_subdirectory (src) | ||
| add_subdirectory (include/GeographicLib) | ||
| -add_subdirectory (tools) | ||
| -add_subdirectory (man) | ||
| -add_subdirectory (doc) | ||
| -add_subdirectory (js) | ||
| -add_subdirectory (matlab) | ||
| -add_subdirectory (python/geographiclib) | ||
| -add_subdirectory (examples) | ||
| +#add_subdirectory (tools) | ||
| +#add_subdirectory (man) | ||
| +#add_subdirectory (doc) | ||
| +#add_subdirectory (js) | ||
| +#add_subdirectory (matlab) | ||
| +#add_subdirectory (python/geographiclib) | ||
| +#add_subdirectory (examples) | ||
| if (MSVC AND BUILD_NETGEOGRAPHICLIB) | ||
| if (GEOGRAPHICLIB_PRECISION EQUAL 2) | ||
| set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) | ||
| diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt | ||
| index 90e773b..1f4e061 100644 | ||
| --- a/cmake/CMakeLists.txt | ||
| +++ b/cmake/CMakeLists.txt | ||
| @@ -33,10 +33,10 @@ configure_file (project-config.cmake.in | ||
| configure_file (project-config-version.cmake.in | ||
| "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY) | ||
| export (TARGETS | ||
| - ${PROJECT_ALL_LIBRARIES} ${TOOLS} | ||
| + ${PROJECT_ALL_LIBRARIES} | ||
| FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") | ||
| export (TARGETS | ||
| - ${PROJECT_ALL_LIBRARIES} ${TOOLS} | ||
| + ${PROJECT_ALL_LIBRARIES} | ||
| NAMESPACE ${PROJECT_NAME}:: | ||
| FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") | ||
|
|
||
| diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in | ||
| index f15702f..089fa17 100644 | ||
| --- a/cmake/project-config-version.cmake.in | ||
| +++ b/cmake/project-config-version.cmake.in | ||
| @@ -35,14 +35,14 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR | ||
| # since a multi-architecture library is built for that platform). | ||
| set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@") | ||
| set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| -elseif (MSVC AND NOT ( | ||
| +#elseif (MSVC AND NOT ( | ||
| # toolset version must be at least as great as @PROJECT_NAME@'s | ||
| - MSVC_TOOLSET_VERSION GREATER_EQUAL @MSVC_TOOLSET_VERSION@ | ||
| +# MSVC_TOOLSET_VERSION GREATER_EQUAL @MSVC_TOOLSET_VERSION@ | ||
| # and major versions must match | ||
| - AND MSVC_TOOLSET_MAJOR EQUAL @MSVC_TOOLSET_MAJOR@ )) | ||
| +# AND MSVC_TOOLSET_MAJOR EQUAL @MSVC_TOOLSET_MAJOR@ )) | ||
| # Reject if there's a mismatch in MSVC compiler versions | ||
| - set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@") | ||
| - set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| +# set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@") | ||
| +# set (PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@") | ||
| # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} | ||
| set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please add vcpkg-cmake-wrapper to solve this?