Skip to content
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.

Sign up for GitHub

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

add osgearth/3.2 #7535

Merged
merged 13 commits into from
Jan 20, 2022
Merged

add osgearth/3.2 #7535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3ab92c
add osgearth/3.2
maspri Sep 30, 2021
9b5ceef
set cpp standard in test_package
maspri Nov 22, 2021
41cd0f0
fix not linking against gdal/protobuf in windows build
maspri Nov 22, 2021
af1f202
disallow apple-clang if cppstd is not set
maspri Nov 23, 2021
e865699
remove default ninja again
maspri Nov 23, 2021
bd5652f
delete fPIC on windows
maspri Nov 24, 2021
87476d7
fix osg include
maspri Nov 24, 2021
1a1b76e
fix getting compiler version
maspri Nov 24, 2021
501222b
Update recipes/osgearth/all/conanfile.py
SSE4 Dec 14, 2021
5c76617
Update recipes/osgearth/all/conanfile.py
SSE4 Dec 14, 2021
248d269
incorporate suggestions
maspri Dec 18, 2021
c78d765
Apply suggested changes
maspri Jan 4, 2022
8a00af8
add version to draco requirement
maspri Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion recipes/osgearth/all/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ if(WIN32)
add_compile_definitions(NOGDI)
endif()

# find_package and set the expected variables
# osgearth ships with custom cmake find modules. Unfortunately these set
# different variables than the ones generated by conan (most notably *_LIBRARY
# instead of *_LIBRARIES, but also different names). In the following
# these different variables are set using the variables set by conan's
# find modules.

# OSG
find_package(OpenSceneGraph REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions recipes/osgearth/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class OsgearthConan(ConanFile):
name = "osgearth"
license = "OSGEARTH SOFTWARE LICENSE"
license = "LGPL-3.0"
url = "https://github.com/conan-io/conan-center-index"
description = "osgEarth is a C++ geospatial SDK and terrain engine. \
Just create a simple XML file, point it at your map data, \
Expand Down Expand Up @@ -124,7 +124,7 @@ def requirements(self):
if self.options.with_sqlite3:
self.requires("sqlite3/3.36.0")
if self.options.with_draco:
self.requires("draco/[>1.3.6]")
self.requires("draco")
maspri marked this conversation as resolved.
Show resolved Hide resolved
# if self.options.with_basisu:
# self.requires("basisu")
# if self.options.with_glew:
Expand Down