FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,821 Commits 1 Branch 26 Tags 73 MiB
67a0f815e4
Commit Graph

291 Commits

Author SHA1 Message Date
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
Robert Osfield
90cda8ede2 Refactored COLLADA_BUILDNAME and COLLADA_BOOST_BUILDNAME to resolve case where CMAKE_VS_PLATFORM_TOOLSET is not set. 2017-05-15 14:53:27 +01:00
Torben Dannhauer
67ef816da0 Update to FindCollada.cmake to handle Visual Studio 2017 binaries 2017-04-05 12:01:55 +01:00
Torben Dannhauer
53a10a7bd9 as preparation for the upcoming 3rdParty package for Visual Studio 2017, I updated Find3rdPartyDependencies.cmake to find also the newest Freetype 2.7.1 release. 2017-03-22 17:27:05 +00:00
Marcel Pursche
1bf303e566 Improved cpack configuration for building debian packages: 
* Added configurable maintainer
* Added configurable dependencies and conflicts per package
* Added post install script to run ldconfig after package is installed
* Updated name of readme file in cpack configuration
 2017-03-20 16:31:09 +01:00
OpenSceneGraph git repository
ce0fbabb4e Merge pull request #207 from LaurensVoerman/submitOpenCascade 
fix OpenCascade library list for use with shared libs; added list and…
 2017-03-13 15:01:08 +00:00
Laurens Voerman
75e6889366 fix OpenCascade library list for use with shared libs; added list and options for static lib 2017-03-13 12:54:02 +01:00
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