From 78964b4baa1f58490e86e8cc79780835360f8969 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 24 Apr 2008 11:34:43 +0000
Subject: [PATCH] Reverted the changes for ill fated tweaks for Apple build

---
 src/OpenThreads/pthreads/CMakeLists.txt | 9 +--------
 src/osg/CMakeLists.txt                  | 9 +--------
 src/osgDB/CMakeLists.txt                | 8 +-------
 src/osgFX/CMakeLists.txt                | 8 +-------
 src/osgGA/CMakeLists.txt                | 8 +-------
 src/osgIntrospection/CMakeLists.txt     | 8 +-------
 src/osgManipulator/CMakeLists.txt       | 8 +-------
 src/osgParticle/CMakeLists.txt          | 8 +-------
 src/osgShadow/CMakeLists.txt            | 8 +-------
 src/osgSim/CMakeLists.txt               | 8 +-------
 src/osgTerrain/CMakeLists.txt           | 8 +-------
 src/osgText/CMakeLists.txt              | 8 +-------
 src/osgUtil/CMakeLists.txt              | 9 +--------
 src/osgViewer/CMakeLists.txt            | 9 ++-------
 14 files changed, 15 insertions(+), 101 deletions(-)

diff --git a/src/OpenThreads/pthreads/CMakeLists.txt b/src/OpenThreads/pthreads/CMakeLists.txt
index 1167e467a..a1e9decb8 100644
--- a/src/OpenThreads/pthreads/CMakeLists.txt
+++ b/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
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index 2b7dd6add..3a79a264c 100644
--- a/src/osg/CMakeLists.txt
+++ b/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
diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt
index efdef4ced..3ab40eab2 100644
--- a/src/osgDB/CMakeLists.txt
+++ b/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
diff --git a/src/osgFX/CMakeLists.txt b/src/osgFX/CMakeLists.txt
index b1531d32f..96eed598d 100644
--- a/src/osgFX/CMakeLists.txt
+++ b/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
diff --git a/src/osgGA/CMakeLists.txt b/src/osgGA/CMakeLists.txt
index b951f177a..ced211cd1 100644
--- a/src/osgGA/CMakeLists.txt
+++ b/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
diff --git a/src/osgIntrospection/CMakeLists.txt b/src/osgIntrospection/CMakeLists.txt
index 59c63e6e0..1da57ba4d 100644
--- a/src/osgIntrospection/CMakeLists.txt
+++ b/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
diff --git a/src/osgManipulator/CMakeLists.txt b/src/osgManipulator/CMakeLists.txt
index 1d688f07c..9f8fba66c 100644
--- a/src/osgManipulator/CMakeLists.txt
+++ b/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
diff --git a/src/osgParticle/CMakeLists.txt b/src/osgParticle/CMakeLists.txt
index e074b5ae6..88f8386e2 100644
--- a/src/osgParticle/CMakeLists.txt
+++ b/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
diff --git a/src/osgShadow/CMakeLists.txt b/src/osgShadow/CMakeLists.txt
index 3a4cb180e..8d5d18096 100644
--- a/src/osgShadow/CMakeLists.txt
+++ b/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
diff --git a/src/osgSim/CMakeLists.txt b/src/osgSim/CMakeLists.txt
index 250a287d4..d0ec49f9b 100644
--- a/src/osgSim/CMakeLists.txt
+++ b/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
diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt
index 64fe034d9..60ead26c7 100644
--- a/src/osgTerrain/CMakeLists.txt
+++ b/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
diff --git a/src/osgText/CMakeLists.txt b/src/osgText/CMakeLists.txt
index 7634377cb..9a3026b40 100644
--- a/src/osgText/CMakeLists.txt
+++ b/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
diff --git a/src/osgUtil/CMakeLists.txt b/src/osgUtil/CMakeLists.txt
index 60bd79538..c79cbe5d2 100644
--- a/src/osgUtil/CMakeLists.txt
+++ b/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
diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt
index 5f4669af8..1228cbcc8 100644
--- a/src/osgViewer/CMakeLists.txt
+++ b/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}
 )