FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,130 Commits 1 Branch 26 Tags 73 MiB
05224e7dac
Commit Graph

334 Commits

Author SHA1 Message Date
Robert Osfield
05224e7dac Merge branch 'master' of https://github.com/arnauddgbes/OpenSceneGraph into arnauddgbes-master 2019-12-12 10:00:08 +00:00
Arnaud Huck
856acfdda4 fixed installation of PDB files on Windows with Ninja generator. Added installation of PDB files for OpenThreads 2019-10-04 09:53:57 +02:00
Remo E
fbc31d9987 First implementation of EGL/Angle support. Tested with GLES3 on DirectX11 platform. 
Pixelbuffer currently not supported.
 2019-08-30 19:28:55 +02:00
Robert Osfield
da40a565bf Added TKXCAF to find package list 2019-08-16 10:28:38 +01:00
Julien Valentin
f87b6303a9 fix cmake block comment syntax 2019-08-16 10:00:49 +01:00
Julien Valentin
23371bf16e remove unproperly parsed CMake comment 
https://github.com/openscenegraph/OpenSceneGraph/issues/812
 2019-08-16 10:00:39 +01:00
Ralf Habacker
2a19d1ab22 cmake: Added find_package module for fontconfig which is not available with cmake < 3.14 
This file has been taken from cmake 3.14
 2019-08-16 10:00:12 +01:00
Daniel Wendt
5fd35e87a2 las plugin: fix linking against static boost library under windows 
Signed-off-by: Daniel Wendt <daniel.wendt@linux.com>
 2019-08-07 10:58:14 +01:00
Robert Osfield
c07d5c07c4 Fixed line ending 2019-03-26 08:06:15 +00:00
Jeongseok Lee
36cceb6930
Update CMakeModules/FindCOLLADA.cmake 
Keeping old style operator to align with OSG CMake 2.8.0 support.

Co-Authored-By: eknabe <44489094+eknabe@users.noreply.github.com>
 2019-03-26 06:52:09 +01:00
Emil Knabe
32db1d04a0 Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph 2019-03-23 13:21:14 +01:00
Emil Knabe
8bd4d9ef49 Updating DAE support for vc141 (VisualStudio2017), aligned with 3rdParty package 2019-03-23 13:14:24 +01:00
Jeongseok Lee
ce61fc413a Use GNUInstallDirs only for CMake >= 2.8.5 2019-03-20 08:56:17 -07:00
Jeongseok Lee
3285bdc8d8 Use GNUInstallDirs for library installation path 2019-03-14 08:46:46 -07:00
dquam
389d55a98a
Undo small change to FindOpenCascade.cmake 
Re-add FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF TKXCAF) to the cmake file.
 2019-01-29 10:07:05 -06:00
Michael X. Grey
ea9d61964d Fix target exporting 2018-11-15 16:38:18 +08:00
Michael X. Grey
af1be65012 Automatically generate pkgconfig files instead of using manually maintained templates 2018-11-15 14:26:41 +08:00
Michael X. Grey
b1b34b51e1 Change to CamelCase package name convention 2018-11-15 12:52:11 +08:00
Michael X. Grey
7440d0c3d8 Make openscenegraph-config.cmake lowercase 2018-11-14 18:43:29 +08:00
Michael X. Grey
b65e29badc Create a config-file and export library targets for downstream users 2018-11-14 18:28:21 +08:00
Emil Knabe
6b7bd07e33 Added support for FBX 2019 2018-10-29 07:22:50 +01:00
Boris Pek
129761ea99 fix build of gta plugin when pkg-config is used 
+ update related variable for build without pkg-config

Tested during cross-compilation for MS Windows using MinGW.
 2018-10-10 02:06:28 +03:00
Thomas Hogarth
9bed712952 Merge remote-tracking branch 'upstream/master' into topic-gles3-android 
merging
 2018-08-28 14:25:38 +01:00
sam
552c5f38e4 fixed cmake regression 2018-07-28 12:40:05 -07:00
Thomas Hogarth
5058a9cd9c Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android 
merge with master
 2018-07-23 23:52:30 +01:00
Thomas Hogarth
4d4ba22b8a removed ios simulator reference, adjusted readme 2018-07-23 23:52:16 +01:00
Calum Robinson
e4cd1583cc Fix FindCollada.cmake for vcpkg installs 
* Handle MSVC_VERSION versions > 1910
* Specify PATH_SUFFIXES rather than individual PATHS for FIND_PATH
 2018-07-23 13:29:48 +01:00
Thomas Hogarth
49e9aadbf5 Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-07-10 02:09:28 +01:00
Robert Osfield
d365a6a347 Added support for Collada DOM-2.5 2018-03-15 15:58:46 +00:00
Aitor Moreno
79fde49084 (re)fix the installation of the PDB files 2018-03-14 16:54:05 +01:00
Aitor Moreno
5fcaf18025 fix installation of PDB files from the examples. 2018-03-13 11:21:35 +01:00
Robert Osfield
556089e6a1 From Raymond de Vries, added support for latest FBX SDK 2018-03-12 10:43:56 +00:00
Alessandro Terenzi
9010fd8035 iOS CMake project generation improvements (bitcode option) 
when building for iOS, Xcode allows developers to specify to enable or disable the 'bitcode' compilation option. There's not a preferred way to go and the choice is really up to the developer but considering that:

1. Currently the generated project defaults the option to YES
2. There are almost 90 projects targets that should be modified if one wants to disable the bitcode option (which considerably reduces the footprint of the app)
3. Even though one can select all the 90+ targets and set the option to NO for all of them, the updates could take a few seconds and could be error prone because one could miss to select some targets

I propose to add a CMake setting that is displayed only when building for iOS. By setting this option "before" the project generation would speed up things for developers and would avoid errors at compiling time.
 2018-03-09 10:17:59 +00:00
Robert Osfield
e84c93dfce Fixed Linux NVTT build issue by restricting the addition of the new libs to just Windows 2018-01-11 10:10:43 +00:00
Robert Osfield
7d311915e7 Merged NVTT cmake fixes from 3.4 branch 2018-01-11 09:39:27 +00:00
Alberto Luaces
958e954b93 Use a minimal set of OpenCASCADE libraries. 
This eases the configuration avoiding to look for unused or nonexistent
libraries.
 2017-12-26 15:45:03 +01:00
OpenSceneGraph git repository
b909ac2d95
Added return to last line 2017-11-30 14:12:05 +00:00
Björn Blissing
09eefd7973 Added script to identify Windows version 
Added script to identify the Windows version used to compile the source.
Currently the windows version for Windows NT is hard coded into the
source. By running this CMake script the _WIN32_WINNT preprocessor
variable gets set to the corresponding windows version.
 2017-11-30 12:53:24 +01:00
Raymond de Vries
41dda781ee attached fixes for configuring and building the osgPlugin exr with Visual Studio and using out-of-the-box builds of ilmbase and openexr, i.e. without manual/extra config for using these 2 libs with the OSG. 
Previously, the assumption was made that ilmbase and openexr were installed in a common directory and hence the header files and libs were both found in that common directory. That is not consistent with other libs and this submission makes it consistent and therefore the OSG configures out of the box. I made this work for ilmbase-2.1.0.tar.gz / openexr-2.1.0.tar.gz and ilmbase-2.2.0.tar.gz / openexr-2.2.0.tar.gz
 2017-11-14 10:59:08 +00:00
Robert Osfield
4f2328bc09 From Raymond de Vires, added support for 2018 and 2016 versions of FBX. 2017-10-30 14:36:41 +00:00
Laurens Voerman
985b3a7206 removed las_c library from FindLIBLAS.cmake, it's not used by the osg plugin. 2017-09-12 09:19:33 +02:00
Daniel Emminizer
a9f0793e69 SETUP_EXE in CMake now uses same define for including the GLCORE headers as SETUP_LIBRARY and SETUP_PLUGIN. Fixes Windows build errors for applications. 2017-08-25 09:04:05 -04:00
Robert Osfield
af609dfb67 Revert commit 904619e219 as it was causeing build problems 2017-08-21 16:24:34 +01:00
Robert Osfield
904619e219 Merged addition of "" around variable from 3.4 branch 2017-08-18 16:13:16 +01:00
Laurens Voerman
c939f7f0fc fix for visual studio trying to link "debug.lib" and "release.lib" 2017-08-17 11:44:06 +02:00
luzpaz
2cd31f65e4 misc. typo fixes 
mostly non-user-facing but some doxy.
 2017-08-15 12:23:49 -04:00
Robert Osfield
c18be2fc41 Replaced local FindZLIB.cmake usage with CMake's own FindZLIB.cmake, and ZLIB_LIBRARY to ZLIB_LIBRARIES 2017-08-09 14:18:35 +01:00
Robert Osfield
e4b4d1aa59 Replaced local FindOurDCMTK.cmake with stock Cmake's FindDCMTK.cmake as the later is now feature complete and has full support for debug and release libraries. 2017-07-26 12:26:38 +01:00
Robert Osfield
9cdeabfbb6 Merged MSVC static build fix from OpenSceneGraph-3.4 2017-07-25 14:56:27 +01:00
cxw
dbff652aed Still build even if CPACK_GENERATOR is undefined 
Without the quotes around `${CPACK_GENERATOR}`, Windows CMake, generating
for VS2013, would exit with an error because the `STREQUAL` only had one arg.
 2017-06-10 22:05:19 -04:00