Commit Graph

278 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
58b9f5208f Merge pull request #206 from LaurensVoerman/submitLAScmake
allow library names liblas.lib and liblas_c.lib;fix include dirs typo…
2017-03-11 11:36:31 +00:00
OpenSceneGraph git repository
fea86426ed Merge pull request #205 from LaurensVoerman/submitGTAcmake
GTA: use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug lnk
2017-03-11 11:35:36 +00:00
Laurens Voerman
ef01913b9a allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin. 2017-02-24 16:21:20 +01:00
Laurens Voerman
f8ed554ddb use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug linking with SET(TARGET_LIBRARIES_VARS GTA_LIBRARY) 2017-02-24 16:09:13 +01:00
Laurens Voerman
0f899a2a1e added FBX SDK 2017.1 and try to add apple (clang) support (not tested - I have no apple) 2017-02-24 15:54:07 +01:00
Robert Osfield
0052a650b8 From Torben Dannhauer, build updates for NVTT. 2016-12-21 17:02:05 +00:00
Robert Osfield
45e1523a09 From Torben Dannahauer, updates to track changes to Winddows 3rd party package 2016-12-21 16:29:38 +00:00
Robert Osfield
b950c428a6 From Vladimir Chebaev, "Dynamic linking of fbx plugin and fbx SDK" 2016-12-21 15:13:49 +00:00
Robert Osfield
5b52f8ca67 Removed debug output 2016-12-21 13:46:18 +00:00
Robert Osfield
5f0f7b88cf Refined the list of libraries to link 2016-12-09 17:29:20 +00:00
Robert Osfield
43b051b984 Teaking FindOpenCascade to help with linking of iges plugin 2016-11-30 20:10:22 +00:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
4e5f0fc3a5 Added a dedicated FindEGL.cmake script to help with locating the EGL.so library and header 2016-10-14 11:06:31 +01:00
Torben Dannhauer
d51036f57e From Torben Dannhauer, added search for new libcurl and libtiff names 2016-10-11 11:02:20 +01:00
Robert Osfield
17328d313d From Torben Dannhauer, added freetype27 (2.7) to search list 2016-10-10 11:21:28 +01:00
Laurens Voerman
2764b52c02 remove CMAKE_BUILD_TYPE STREQUAL "Release" (cmake configure time varable) to select pdb install - select CONFIGURATIONS RelWithDebInfo Debug 2016-10-07 17:49:42 +02:00
Robert Osfield
bd85bc0cf3 Changed tabs to four spaces to avoid different editors rendering the indentation differently 2016-10-06 11:34:53 +01:00
Laurens Voerman
cba84f74aa adaptations for cmake changes mid 2015 (SelectLibraryConfigurations.cmake) with SelectLibraryConfigurations.cmake
collada zlib debug library linking added
2016-10-06 11:19:01 +02:00
Laurens Voerman
c03414ac57 added vc14 (Visual Studio 2015) and boost 1.58 support in FindCOLLADA.cmake 2016-09-30 14:33:28 +02:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
3f91c5d970 Changed the min CMake version to 2.8.0 2016-09-22 18:33:35 +01:00
Stuart Mentzer
2c4a5319bf Final version of FindFreetype.cmake that is based on the now-accepted CMake patches. This supports the new freetype include path structure and fixes the failure to find the debug library on Windows due to its name having a 'd' suffix. 2016-09-05 12:18:46 +01:00
Ravi Mathur
e9d6737ec4 Updates to the CMake build system for Mac OSX 2016-08-10 14:30:28 +01:00
Philippe Renon
89b9de8ab4 fix FindGStreamer.cmake for msys2 mingw 2016-07-03 17:43:39 +02:00
Philippe Renon
861b96e154 msys2: fix ffmpeg pluging compilation error due to spurious stdint related includes 2016-06-11 17:39:52 +02:00
Laurens Voerman
15e9484ff2 Build and warning fixes 2016-06-06 17:54:29 +01:00
Robert Osfield
5211c782d8 Added _LIBRARIES var to mix 2016-06-01 16:22:42 +01:00
Robert Osfield
853fad71ae Changed freetype plugin to utilize CMake's FindFreetype.cmake rather than use a local one. 2016-06-01 15:51:49 +01:00
Robert Osfield
5c5753682b Fixed line endings 2016-06-01 15:09:21 +01:00
Robert Osfield
2be4e3c4d6 Fixed missing " 2016-06-01 12:50:38 +01:00
Robert Osfield
ebfbc3dd78 Added macosx10.11 to the list of supported OSX SDK's 2016-06-01 11:41:10 +01:00
Robert Osfield
1c78996a09 Added in extra search paths for FBX 2016-06-01 11:26:18 +01:00
Stephan van Alste
e6d200abfb Do not install non existant pdb file in release build mode 2016-05-31 17:05:39 +01:00
Ralf Habacker
fc3e30ef25 Install msvc debug files along with the binaries 2016-05-31 17:02:33 +01:00
Robert Osfield
09bde307de To the COLLADA_INCLUDE_DIR search paths added the directories:
/usr/local/include/collada-dom2.4
    /usr/local/include/collada-dom2.2
    /opt/local/include/collada-dom2.4
    /opt/local/include/collada-dom2.2
    /usr/include/collada-dom2.4
    /usr/include/collada-dom2.2

To enable recent versions of the DOM to be found in their new install locations.
2016-02-19 12:19:12 +00:00
Robert Osfield
41f284b678 Moved FIND_PACKAGE(Boost) to within the individual Find scripts that actually need it rather in the root CMakeLists.txt.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15093 16af8721-9629-0410-8352-f15c8da7e697
2015-08-11 08:43:40 +00:00
Robert Osfield
e4697ae7fc From Terry Welsh, "I downloaded the Android 3rdparty deps from here
http://www.openscenegraph.org/index.php/download-section/dependencies
but was not able to use them for a while. Attached are changes to
OsgAndroidMacroUtils.cmake that allow the deps to be found by cmake.

Specifically, all FIND_PATH commands require the
NO_CMAKE_FIND_ROOT_PATH option to actually find paths. This is odd
because if you inspect CMAKE_FIND_ROOT_PATH it appears to be empty. I
would expect it to have no effect at all.

I also needed to remove quotes from this line in order for headers to be found:

set(FREETYPE_INCLUDE_DIRS "${FREETYPE_DIR}/include
${FREETYPE_DIR}/include/freetype/config")

Assuming this script worked in the past, it seems like cmake behavior
may have changed at some point. I'm using cmake version 2.8.12.2."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15036 16af8721-9629-0410-8352-f15c8da7e697
2015-07-31 13:46:57 +00:00
Robert Osfield
6c83b2e3a9 From KOS, "'ve mentioned in the "osg-users" ML about build error with the newest GStreamer 1.5
Please, have a look at the attached patch.

CMakeModules/FindGStreamer.cmake"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14984 16af8721-9629-0410-8352-f15c8da7e697
2015-07-17 18:31:22 +00:00
Robert Osfield
e69405f99a From Laurens Voerman, "attached is a zip with the files:
OpenSceneGraph\CMakeModules\FindOpenEXR.cmake

I introduced a bug in the previous submission pointed out by Dmitry Marakasov:
looking for IlmIlf instead of IlmImf (as the previous version did - but using variable OPENEXR_IlmIlf_LIBRARY)

For some reason google decided his message was spam, so I just noticed it, and I reply to confirm his remarks and attach a full file.

"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14908 16af8721-9629-0410-8352-f15c8da7e697
2015-06-10 16:48:28 +00:00
Robert Osfield
d14a602a59 From Jannik Heller, typo fixes
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14882 16af8721-9629-0410-8352-f15c8da7e697
2015-06-01 13:11:49 +00:00
Robert Osfield
0a1db3d6fc From Jannik Heller, typo fixes
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14832 16af8721-9629-0410-8352-f15c8da7e697
2015-04-13 10:43:56 +00:00
Robert Osfield
a711fdba36 From Laurens Voerman, I have modified the FindOpenEXR.cmake to find the debug libraries, and to define a variable
(OPENEXR_LIBRARIES_VARS) with the variable names that might have a _DEBUG version defined.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14830 16af8721-9629-0410-8352-f15c8da7e697
2015-04-13 09:50:27 +00:00
Robert Osfield
dd2de7f132 From Laurens Voerman, "attached is a zip with a modified version of:
OpenSceneGraph\CMakeModules\FindFBX.cmake

This version can find fbx sdk 2015.1 and will prefer it over older versions.

Tested with Visual Studio Express 2013 on 64bit windows 7"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14782 16af8721-9629-0410-8352-f15c8da7e697
2015-03-12 15:12:29 +00:00
Robert Osfield
47202acc24 From Dmitry Marakasov, "While packaging osg-3.3.3 I've discovered that gstreamer detection is
broken:

-- Could NOT find GStreamer (missing:  GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS GSTREAMER_GSTREAMER-APP_LIBRARIES GSTREAMER_GSTREAMER-PBUTILS_INCLUDE_DIRS GSTREAMER_GSTREAMER-PBUTILS_LIBRARIES) (found version "1.4.5")

though all required modules are installed.

There are two problems: first, module names are spelled incorrectly in root
CMakeLists.txt (e.g. gstreamer-app instead of app), so variables expected
for them are e.g. GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS instead of
GSTREAMER_APP_INCLUDE_DIRS.

Second, gstreamer base component is detected as GSTREAMER while checked
later as GSTREAMER_BASE. I've uncommented the detection as
GSTREAMER_BASE, but obviously that should be revisited and only one
detection left. With this patch, gstreamer is detected properly and
the plugins is successfully built and installed."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14719 16af8721-9629-0410-8352-f15c8da7e697
2015-02-25 19:25:34 +00:00
Robert Osfield
d409ffcb91 From Javier Taibo, "I have found that since version 1.1, FFMPEG changed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application.
$ osgmovie --audio movie.avi.ffmpeg
  FFmpegImageStream::open audio failed, audio stream will be disabled: unknown audio format

  With the attached FFmpegDecoderAudio.cpp, audio sounds correctly.

  I am also attaching a modified version of FindFFmpeg.cmake that allows to set as FFMPEG_DIR the ffmpeg compiled in the source directory structure. It should not break anything as it only adds some additional search paths.
"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14654 16af8721-9629-0410-8352-f15c8da7e697
2015-01-07 14:14:55 +00:00
Robert Osfield
1b1c987356 Removed debug message
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14642 16af8721-9629-0410-8352-f15c8da7e697
2014-12-24 11:43:41 +00:00
Robert Osfield
5a4f962013 Changes to allow the COLLADA plugin to compile against the latest COLLADA DOM version 2.4 as well as retaining compatibility with the old 2.2 DOM.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14633 16af8721-9629-0410-8352-f15c8da7e697
2014-12-23 12:10:03 +00:00
Robert Osfield
dfc02b78bf Added if () block to avoid script variables set to NOT-Found being used in searching
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14624 16af8721-9629-0410-8352-f15c8da7e697
2014-12-19 08:27:30 +00:00
Robert Osfield
a03ec99005 Fixed script warnings
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14623 16af8721-9629-0410-8352-f15c8da7e697
2014-12-19 08:25:35 +00:00
Robert Osfield
8be71caeaf From Aitor Moreno, LAS plugin - depends upon boost and liblas and liblas-c
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14622 16af8721-9629-0410-8352-f15c8da7e697
2014-12-18 17:47:08 +00:00