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

Reverted the changes for ill fated tweaks for Apple build

Browse Source
This commit is contained in:
Robert Osfield 2008-04-24 11:34:43 +00:00
parent bcee43bf44
commit 78964b4baa
14 changed files with 15 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,16 +8,9 @@ INCLUDE (CheckCXXSourceCompiles)
SET(LIB_NAME OpenThreads)
SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS})
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
PThread.c++
PThreadBarrier.c++
PThreadBarrierPrivateData.h

9
src/osg/CMakeLists.txt
View File

@ -170,16 +170,9 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/ref_ptr
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
AlphaFunc.cpp
AnimationPath.cpp
ApplicationUsage.cpp

8
src/osgDB/CMakeLists.txt
View File

@ -30,16 +30,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/WriteFile
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
Archive.cpp
DatabasePager.cpp
DotOsgWrapper.cpp

8
src/osgFX/CMakeLists.txt
View File

@ -22,16 +22,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
AnisotropicLighting.cpp
BumpMapping.cpp
Cartoon.cpp

8
src/osgGA/CMakeLists.txt
View File

@ -27,16 +27,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
AnimationPathManipulator.cpp
DriveManipulator.cpp
EventQueue.cpp

8
src/osgIntrospection/CMakeLists.txt
View File

@ -39,16 +39,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/variant_cast
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
ConstructorInfo.cpp
CustomAttributeProvider.cpp
DefaultReflectors.cpp

8
src/osgManipulator/CMakeLists.txt
View File

@ -32,16 +32,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
AntiSquish.cpp
Command.cpp
CommandManager.cpp

8
src/osgParticle/CMakeLists.txt
View File

@ -50,16 +50,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
ConnectedParticleSystem.cpp
Emitter.cpp
ExplosionDebrisEffect.cpp

8
src/osgShadow/CMakeLists.txt
View File

@ -20,16 +20,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
OccluderGeometry.cpp
ShadowMap.cpp
ShadowTechnique.cpp

8
src/osgSim/CMakeLists.txt
View File

@ -34,16 +34,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/VisibilityGroup
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
BlinkSequence.cpp
ColorRange.cpp
DOFTransform.cpp

8
src/osgTerrain/CMakeLists.txt
View File

@ -18,16 +18,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
Layer.cpp
Locator.cpp
TerrainTile.cpp

8
src/osgText/CMakeLists.txt
View File

@ -20,16 +20,10 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
DefaultFont.cpp
DefaultFont.h
Font.cpp

9
src/osgUtil/CMakeLists.txt
View File

@ -48,16 +48,9 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} )
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
CubeMapGenerator.cpp
CullVisitor.cpp
DelaunayTriangulator.cpp

9
src/osgViewer/CMakeLists.txt
View File

@ -87,16 +87,11 @@ ELSE(WIN32)
ENDIF(WIN32)
IF(APPLE)
SET(ADD_LIBRARY_HEADERS "")
ELSEIF(APPLE)
SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS})
ENDIF(APPLE)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${ADD_LIBRARY_HEADERS}
${LIB_PUBLIC_HEADERS}
${LIB_PRIVATE_HEADERS}
${LIB_COMMON_FILES}
)