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.

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 openscenegraph/3.6.5 #2702

Merged
merged 31 commits into from
Jan 18, 2021
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
de18580
Add openscenegraph/3.6.5
ohanar Aug 28, 2020
afe53d3
[openscenegraph] add .exe extension for Windows
ohanar Aug 31, 2020
f46aecd
[openscenegraph] use cmake_find_package_multi
ohanar Aug 31, 2020
ff28e1e
[openscenegraph] explicitly set output directory in test package
ohanar Aug 31, 2020
97bece4
[openscenegraph] flesh out test_package
ohanar Sep 1, 2020
3a6b942
[openscenegraph] media plugins are very apple os version specific
ohanar Sep 3, 2020
4140085
[openscenegraph] explicitly set output directory in test package take 2
ohanar Sep 3, 2020
f350de5
[openscenegraph] check for gz support rather than osgz
ohanar Sep 3, 2020
92dcdae
[openscenegraph] Version doesn't handle settings, pass the value
ohanar Sep 14, 2020
20ae237
[openscenegraph] test_package: more apple shenanigans
ohanar Sep 15, 2020
2fce099
[openscenegraph] Macos: can't insure video plugins exist without an o…
ohanar Sep 15, 2020
588a593
[openscenegraph] apple system libs are really frameworks
ohanar Sep 15, 2020
537e4d5
[openscenegraph] refactor package_info method
ohanar Sep 15, 2020
f8e934e
[openscenegraph] imageio plugin uses the Accelerate framework
ohanar Sep 16, 2020
d6aca94
[openscenegraph] fix test package for imageio supported formats
ohanar Sep 16, 2020
a0a8c06
[openscenegraph] rework to use conan's cmake_find_package scripts
ohanar Sep 18, 2020
d33c603
[openscenegraph] add missing OSG_WITH_NVTT to patch
ohanar Sep 21, 2020
78822be
[openscenegraph] remove pdbs via script
ohanar Sep 21, 2020
deda7b2
[openscenegraph] remove workaround for #2311
ohanar Sep 28, 2020
d8abf5c
[openscenegraph] add fix for building against static libjpeg on windows
ohanar Sep 29, 2020
b845c70
[openscenegraph] don't use conan toolchains, they're not stable enough
ohanar Sep 30, 2020
11fad6b
[openscenegraph] add conan_basic_setup to test package
ohanar Sep 30, 2020
d265dc1
[openscenegraph] update dependencies
ohanar Oct 20, 2020
4e9d383
[openescenegraph] fix hooks
ohanar Oct 20, 2020
ad3c4a3
[openscenegraph] uncomment asio stuff where possible
ohanar Oct 28, 2020
308dd74
[openscenegraph] remove no_copy_source and patch in build step
ohanar Oct 28, 2020
24e066f
[openscenegraph] remove build_examples option
ohanar Oct 28, 2020
b2fb8e7
[openscenegraph] cache cmake instance
ohanar Oct 29, 2020
777855a
[openscenegraph] set pkg-config component names
ohanar Oct 29, 2020
b73ae1e
[openscenegraph] add link to asio issue
ohanar Jan 5, 2021
0e58985
[openscenegraph] remove .value from settings
ohanar Jan 5, 2021
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
Prev Previous commit
Next Next commit
[openscenegraph] media plugins are very apple os version specific
ohanar committed Sep 3, 2020
commit 3a6b94221b62ab94a42b8694e02d9d8214462143
19 changes: 8 additions & 11 deletions recipes/openscenegraph/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from conans import CMake, ConanFile, tools
from conans.model.version import Version
import glob, os


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you are using components

Suggested change
required_conan_version = ">=1.28.0"

@@ -79,10 +80,6 @@ class ConanFile(ConanFile):

_source_subfolder = "source_subfolder"

@property
def _apple(self):
return self.settings.os.value in ("Macos", "iOS", "watchOS", "tvOS")

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
@@ -91,7 +88,7 @@ def config_options(self):
# Default to false with fontconfig until it is supported on Windows
self.options.use_fontconfig = False

if self._apple:
if tools.is_apple_os(self.settings.os):
# osg uses native apis on Apple platforms
del self.options.with_gif
del self.options.with_jpeg
@@ -307,7 +304,7 @@ def setup_library(lib):
self.cpp_info.components["osgDB"].requires = ["osg", "osgUtil", "OpenThreads"]
if self.settings.os == "Linux":
self.cpp_info.components["osgDB"].system_libs = ["dl"]
elif self._apple:
elif tools.is_apple_os(self.settings.os):
self.cpp_info.components["osgDB"].system_libs = ["Cocoa"]
if self.options.with_zlib:
self.cpp_info.components["osgDB"].requires.append("zlib::zlib")
@@ -328,7 +325,7 @@ def setup_library(lib):
if self.options.enable_windowing_system:
if self.settings.os == "Linux":
self.cpp_info.components["osgViewer"].requires.append("xorg::xorg")
elif self._apple:
elif tools.is_apple_os(self.settings.os):
self.cpp_info.components["osgViewer"].system_libraries = ["Cocoa"]
if self.settings.os == "Windows":
self.cpp_info.components["osgViewer"].system_libraries = ["gdi32"]
@@ -533,19 +530,19 @@ def setup_library(lib):
# with_directshow
# setup_plugin("directshow")

if self._apple:
if tools.is_apple_os(self.settings.os):
setup_plugin("imageio")

if self._apple:
if (self.settings.os == "Macos" and Version(self.settings.os.version) >= "10.8") or (self.settings.os == "iOS" and Version(self.settings.os.version) >= "6.0"):
plugin = setup_plugin("avfoundation")
self.cpp_info.components[plugin].requires.append("osgViewer")
self.cpp_info.components[plugin].system_libs = ["AVFoundation", "Cocoa", "CoreVideo", "CoreMedia", "QuartzCore"]

if self._apple:
if self.settings.os == "Macos" and Version(self.settings.os.version) <= "10.6" and self.settings.arch == "x86":
plugin = setup_plugin("qt")
self.cpp_info.components[plugin].system_libs = ["QuickTime"]

if self._apple:
if self.settings.os == "Macos" and self.settings.arch == "x86":
plugin = setup_plugin("QTKit")
self.cpp_info.components[plugin].requires.append("osgViewer")
self.cpp_info.components[plugin].system_libs = ["QTKit", "Cocoa", "QuickTime", "CoreVideo"]