FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber,

Browse Source 
"changed the CmakeFiles for OpenThreads and the
osg-frameworks, so they are versioned by OPENSCENEGRAPH_SOVERSION. "

And from a later email:

"Attached you'll find a fixed version of ModulInstall.cmake. Hopefully it
works for old CMake-versions. I removed the offending line, and the
compile went fine on my end."
This commit is contained in:
Robert Osfield 2010-07-31 08:57:52 +00:00
parent 959cfc680f
commit effd8919ad
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeModules/ModuleInstall.cmake
View File

@ -30,7 +30,6 @@ INSTALL(
RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph
LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph
ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev
FRAMEWORK DESTINATION /Library/Frameworks
) )
IF(NOT OSG_COMPILE_FRAMEWORKS) IF(NOT OSG_COMPILE_FRAMEWORKS)
@ -45,7 +44,7 @@ ELSE()
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
FRAMEWORK_VERSION ${OPENSCENEGRAPH_VERSION} FRAMEWORK_VERSION ${OPENSCENEGRAPH_SOVERSION}
PUBLIC_HEADER "${LIB_PUBLIC_HEADERS}" PUBLIC_HEADER "${LIB_PUBLIC_HEADERS}"
INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}" INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}"
) )

2
src/OpenThreads/pthreads/CMakeLists.txt
View File

@ -139,7 +139,7 @@ ELSE()
MESSAGE("Will compile OpenThreads.framework!") MESSAGE("Will compile OpenThreads.framework!")
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
FRAMEWORK_VERSION ${OPENTHREADS_VERSION} FRAMEWORK_VERSION ${OPENTHREADS_SOVERSION}
PUBLIC_HEADER "${OpenThreads_PUBLIC_HEADERS}" PUBLIC_HEADER "${OpenThreads_PUBLIC_HEADERS}"
INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}" INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}"
) )