-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[geos] Update to 3.10.0 #21051
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
Merged
Merged
[geos] Update to 3.10.0 #21051
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
98ad340
Update geos to 3.10.0
dg0yt 08c8795
Enable geos on uwp
dg0yt 42acdc6
Update versions
dg0yt 669075b
Fix mingw build
dg0yt 9fe4c15
Fix deinstallation
dg0yt b59c4f3
Update versions
dg0yt 1eb855a
Merge branch 'master' of https://github.com/microsoft/vcpkg
dg0yt 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index accc1a2..34d2055 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -174,7 +174,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) | ||
| target_compile_options(geos_cxx_flags INTERFACE | ||
| "$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>" | ||
| "$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>" | ||
| - "$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>" | ||
| + $<$<CXX_COMPILER_ID:MSVC>:/fp:precise /wd4996> | ||
| ) | ||
|
|
||
| # Use -ffloat-store for 32-bit builds (needed to make some tests pass) | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt | ||
| index bc0e774..e3ca0bd 100644 | ||
| --- a/tools/CMakeLists.txt | ||
| +++ b/tools/CMakeLists.txt | ||
| @@ -45,11 +45,18 @@ function(configure_install_geos_pc) | ||
| set(includedir "$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") | ||
| set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") | ||
| set(VERSION ${GEOS_VERSION}) | ||
| - set(EXTRA_LIBS "-lstdc++") | ||
| + if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+") | ||
| + set(EXTRA_LIBS "-lc++") | ||
| + elseif(UNIX OR MINGW) | ||
| + set(EXTRA_LIBS "-lstdc++") | ||
| + else() | ||
| + set(EXTRA_LIBS "") | ||
| + endif() | ||
| if(HAVE_LIBM) | ||
| list(APPEND EXTRA_LIBS "-lm") | ||
| endif() | ||
| list(JOIN EXTRA_LIBS " " EXTRA_LIBS) | ||
| + set(EXTRA_LIBS "${EXTRA_LIBS}" PARENT_SCOPE) # for geos-config | ||
|
|
||
| configure_file( | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in | ||
| @@ -61,9 +68,9 @@ function(configure_install_geos_pc) | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
| endfunction() | ||
|
|
||
| +configure_install_geos_pc() | ||
| if(NOT MSVC) | ||
| configure_install_geos_config() | ||
| - configure_install_geos_pc() | ||
| endif() | ||
|
|
||
| option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF) | ||
| diff --git a/tools/geos-config.in b/tools/geos-config.in | ||
| index 6eff1eb..8827f6a 100644 | ||
| --- a/tools/geos-config.in | ||
| +++ b/tools/geos-config.in | ||
| @@ -1,9 +1,11 @@ | ||
| #!/bin/sh | ||
|
|
||
| -prefix=@prefix@ | ||
| -exec_prefix=@exec_prefix@ | ||
| -includedir=@includedir@ | ||
| -libdir=@libdir@ | ||
| +DIRNAME=$(dirname $0) | ||
| +TOOLS=$(dirname $DIRNAME) | ||
| +prefix=$(CDPATH= cd -- "${DIRNAME%/tools/geos/*}" && pwd -P) | ||
| +exec_prefix=${prefix} | ||
| +includedir=${prefix}/include | ||
| +libdir=${prefix}${TOOLS##*/geos}/lib | ||
|
|
||
| usage() | ||
| { | ||
| @@ -47,16 +49,16 @@ while test $# -gt 0; do | ||
| echo -L${libdir} -lgeos-@VERSION_RELEASE@ | ||
| ;; | ||
| --clibs) | ||
| - echo -L${libdir} -lgeos_c | ||
| + echo -L${libdir} -lgeos_c $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "-lgeos @EXTRA_LIBS@"; fi) | ||
| ;; | ||
| --cclibs) | ||
| - echo -L${libdir} -lgeos | ||
| + echo -L${libdir} -lgeos $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "@EXTRA_LIBS@"; fi) | ||
| ;; | ||
| --static-clibs) | ||
| - echo -L${libdir} -lgeos_c -lgeos -lm | ||
| + echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@ | ||
| ;; | ||
| --static-cclibs) | ||
| - echo -L${libdir} -lgeos -lm | ||
| + echo -L${libdir} -lgeos @EXTRA_LIBS@ | ||
| ;; | ||
| --cflags) | ||
| echo -I${includedir} |
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 20c8907..accc1a2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -367,7 +367,7 @@ install(DIRECTORY | ||
| "${CMAKE_CURRENT_LIST_DIR}/include/geos" | ||
| "${CMAKE_CURRENT_BINARY_DIR}/include/geos" | ||
| DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
| - FILES_MATCHING PATTERN "*.h") | ||
| + FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") | ||
| if(NOT DISABLE_GEOS_INLINE) | ||
| install(DIRECTORY | ||
| "${CMAKE_CURRENT_LIST_DIR}/include/geos" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.