476cb5373e
"Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine." |
||
---|---|---|
.. | ||
clean_directories | ||
cmake_uninstall.cmake.in | ||
Find3rdPartyDependencies.cmake | ||
FindCOLLADA.cmake | ||
FindFLTK.cmake | ||
FindFOX.cmake | ||
FindFreeType.cmake | ||
FindGDAL.cmake | ||
FindGIFLIB.cmake | ||
FindInventor.cmake | ||
FindJasper.cmake | ||
FindOpenThreads.cmake | ||
FindOpenVRML.cmake | ||
FindOSG.cmake | ||
FindPerformer.cmake | ||
FindQuickTime.cmake | ||
FindXine.cmake | ||
FindZLIB.cmake | ||
ListHandle.cmake | ||
ModuleInstall.cmake | ||
OsgMacroUtils.cmake | ||
UtilityMacros.cmake |