Reverted the changes for ill fated tweaks for Apple build

src/OpenThreads/pthreads/CMakeLists.txt

@@ -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

src/osg/CMakeLists.txt

@@ -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

src/osgDB/CMakeLists.txt

@@ -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

src/osgFX/CMakeLists.txt

@@ -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

src/osgGA/CMakeLists.txt

@@ -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

src/osgIntrospection/CMakeLists.txt

@@ -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

src/osgManipulator/CMakeLists.txt

@@ -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

src/osgParticle/CMakeLists.txt

@@ -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

src/osgShadow/CMakeLists.txt

@@ -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

src/osgSim/CMakeLists.txt

@@ -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

src/osgTerrain/CMakeLists.txt

@@ -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

src/osgText/CMakeLists.txt

@@ -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

src/osgUtil/CMakeLists.txt

@@ -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

src/osgViewer/CMakeLists.txt

@@ -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}
 )