-
Notifications
You must be signed in to change notification settings - Fork 8
Add geos, libzip, protobuf and qgis #80
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
Open
m-kuhn
wants to merge
11
commits into
OpenOrienteering:latest
Choose a base branch
from
m-kuhn:qgis
base: latest
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9bc1dde
libwebp: Suppress compiler warning
dg0yt fc67c94
qt: Add 5.15.1
dg0yt 5d35b85
qtimageformats: Update to 5.15.1
dg0yt 1f11f05
libwebp: Enable libwebpmux
dg0yt 8ca86dd
openorienteering-mapper: Build with Qt 5.15
dg0yt 55f8989
ci: Relax openorienteering-mapper configuration
dg0yt 577f98b
ci: Install mingw-w64-wintab-sdk
dg0yt 145706f
WIP: Update android toolchain to NDK r21d
dg0yt ecdf19b
WIP: Merge branch 'dg0yt' into latest
dg0yt 2f166fb
WIP: Fix qttools build
dg0yt b828f74
Add geos, libzip, protobuf and qgis
m-kuhn 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| # This file is part of OpenOrienteering. | ||
|
|
||
| # Copyright 2016-2020 Kai Pastor | ||
| # | ||
| # Redistribution and use is allowed according to the terms of the BSD license: | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions | ||
| # are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # 2. Redistributions in binary form must reproduce the copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # 3. The name of the author may not be used to endorse or promote products | ||
| # derived from this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| # https://tracker.debian.org/pkg/gdal | ||
|
|
||
| set(version 3.8.1) | ||
| set(download_hash SHA256=605df3f99056b7bb9c48f20d67e90e539f5a9ca5b2c7896d58ba06e3217dc106) | ||
| set(patch_version ${version}) | ||
| set(base_url https://github.com/libgeos/geos/archive/) | ||
|
|
||
| superbuild_package( | ||
| NAME geos | ||
| VERSION ${patch_version} | ||
| DEPENDS | ||
| common-licenses | ||
|
|
||
| SOURCE | ||
| URL ${base_url}${version}.tar.gz | ||
| URL_HASH ${download_hash} | ||
|
|
||
| USING patch_version extra_cflags extra_cxxflags | ||
| BUILD [[ | ||
| CMAKE_ARGS | ||
| "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" | ||
| "-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>" | ||
| -DBUILD_SHARED_LIBS=ON | ||
| -DBUILD_TESTING=ON | ||
| -DDISABLE_GEOS_INLINE=ON | ||
| $<$<NOT:$<OR:$<BOOL:@CMAKE_CROSSCOMPILING@>,$<BOOL:@MSYS@>>>: | ||
| INSTALL_COMMAND | ||
| "${CMAKE_COMMAND}" --build . --target install/strip/fast | ||
| ]] | ||
| ) | ||
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
Oops, something went wrong.
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.
Missing adaption