Refactored the inclusion of the headers in the ADD_LIBRARY so that they aren't

added under OSX.
2008-04-23 20:50:53 +00:00
parent 77b98eb5f8
commit 8ae30c9bfc
14 changed files with 101 additions and 15 deletions
--- a/src/OpenThreads/pthreads/CMakeLists.txt
+++ b/src/OpenThreads/pthreads/CMakeLists.txt
@@ -8,9 +8,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
 	PThread.c++
 	PThreadBarrier.c++
 	PThreadBarrierPrivateData.h
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -170,9 +170,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    AlphaFunc.cpp
    AnimationPath.cpp
    ApplicationUsage.cpp
--- a/src/osgDB/CMakeLists.txt
+++ b/src/osgDB/CMakeLists.txt
@@ -30,10 +30,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    Archive.cpp
    DatabasePager.cpp
    DotOsgWrapper.cpp
--- a/src/osgFX/CMakeLists.txt
+++ b/src/osgFX/CMakeLists.txt
@@ -22,10 +22,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    AnisotropicLighting.cpp
    BumpMapping.cpp
    Cartoon.cpp
--- a/src/osgGA/CMakeLists.txt
+++ b/src/osgGA/CMakeLists.txt
@@ -27,10 +27,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    AnimationPathManipulator.cpp
    DriveManipulator.cpp
    EventQueue.cpp
--- a/src/osgIntrospection/CMakeLists.txt
+++ b/src/osgIntrospection/CMakeLists.txt
@@ -39,10 +39,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    ConstructorInfo.cpp
    CustomAttributeProvider.cpp
    DefaultReflectors.cpp
--- a/src/osgManipulator/CMakeLists.txt
+++ b/src/osgManipulator/CMakeLists.txt
@@ -32,10 +32,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    AntiSquish.cpp
    Command.cpp
    CommandManager.cpp
--- a/src/osgParticle/CMakeLists.txt
+++ b/src/osgParticle/CMakeLists.txt
@@ -50,10 +50,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    ConnectedParticleSystem.cpp
    Emitter.cpp
    ExplosionDebrisEffect.cpp
--- a/src/osgShadow/CMakeLists.txt
+++ b/src/osgShadow/CMakeLists.txt
@@ -20,10 +20,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    OccluderGeometry.cpp
    ShadowMap.cpp
    ShadowTechnique.cpp
--- a/src/osgSim/CMakeLists.txt
+++ b/src/osgSim/CMakeLists.txt
@@ -34,10 +34,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    BlinkSequence.cpp
    ColorRange.cpp
    DOFTransform.cpp
--- a/src/osgTerrain/CMakeLists.txt
+++ b/src/osgTerrain/CMakeLists.txt
@@ -18,10 +18,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    Layer.cpp
    Locator.cpp
    TerrainTile.cpp
--- a/src/osgText/CMakeLists.txt
+++ b/src/osgText/CMakeLists.txt
@@ -20,10 +20,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    DefaultFont.cpp
    DefaultFont.h
    Font.cpp
--- a/src/osgUtil/CMakeLists.txt
+++ b/src/osgUtil/CMakeLists.txt
@@ -48,9 +48,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    CubeMapGenerator.cpp
    CullVisitor.cpp
    DelaunayTriangulator.cpp
--- a/src/osgViewer/CMakeLists.txt
+++ b/src/osgViewer/CMakeLists.txt
@@ -87,11 +87,16 @@ 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}
-    ${LIB_PUBLIC_HEADERS}
-    ${LIB_PRIVATE_HEADERS}
+    ${ADD_LIBRARY_HEADERS}
    ${LIB_COMMON_FILES}
 )