Changeset 8211

Show
Ignore:
Timestamp:
04/24/08 13:34:43 (5 years ago)
Author:
robert
Message:

Reverted the changes for ill fated tweaks for Apple build

Location:
OpenSceneGraph/trunk/src
Files:
14 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/OpenThreads/pthreads/CMakeLists.txt

    r8201 r8211  
    99SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS}) 
    1010 
    11 IF(APPLE) 
    12     SET(ADD_LIBRARY_HEADERS "") 
    13 ELSEIF(APPLE) 
    14     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    15 ENDIF(APPLE) 
    16  
    17 # FIXME: For OS X, need flag for Framework or dylib 
    1811ADD_LIBRARY(${LIB_NAME} 
    1912    ${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC} 
    20     ${ADD_LIBRARY_HEADERS} 
     13    ${LIB_PUBLIC_HEADERS} 
    2114        PThread.c++ 
    2215        PThreadBarrier.c++ 

  • OpenSceneGraph/trunk/src/osg/CMakeLists.txt

    r8201 r8211  
    171171) 
    172172 
    173 IF(APPLE) 
    174     SET(ADD_LIBRARY_HEADERS "") 
    175 ELSEIF(APPLE) 
    176     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    177 ENDIF(APPLE) 
    178  
    179 # FIXME: For OS X, need flag for Framework or dylib 
    180173ADD_LIBRARY(${LIB_NAME} 
    181174    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    182     ${ADD_LIBRARY_HEADERS} 
     175    ${LIB_PUBLIC_HEADERS} 
    183176    AlphaFunc.cpp 
    184177    AnimationPath.cpp 

  • OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

    r8201 r8211  
    3131) 
    3232 
    33 IF(APPLE) 
    34     SET(ADD_LIBRARY_HEADERS "") 
    35 ELSEIF(APPLE) 
    36     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    37 ENDIF(APPLE) 
    38  
    3933# FIXME: For OS X, need flag for Framework or dylib 
    4034ADD_LIBRARY(${LIB_NAME} 
    4135    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    42     ${ADD_LIBRARY_HEADERS} 
     36    ${LIB_PUBLIC_HEADERS} 
    4337    Archive.cpp 
    4438    DatabasePager.cpp 

  • OpenSceneGraph/trunk/src/osgFX/CMakeLists.txt

    r8201 r8211  
    2323) 
    2424 
    25 IF(APPLE) 
    26     SET(ADD_LIBRARY_HEADERS "") 
    27 ELSEIF(APPLE) 
    28     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    29 ENDIF(APPLE) 
    30  
    3125# FIXME: For OS X, need flag for Framework or dylib 
    3226ADD_LIBRARY(${LIB_NAME} 
    3327    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    34     ${ADD_LIBRARY_HEADERS} 
     28    ${LIB_PUBLIC_HEADERS} 
    3529    AnisotropicLighting.cpp 
    3630    BumpMapping.cpp 

  • OpenSceneGraph/trunk/src/osgGA/CMakeLists.txt

    r8201 r8211  
    2828) 
    2929 
    30 IF(APPLE) 
    31     SET(ADD_LIBRARY_HEADERS "") 
    32 ELSEIF(APPLE) 
    33     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    34 ENDIF(APPLE) 
    35  
    3630# FIXME: For OS X, need flag for Framework or dylib 
    3731ADD_LIBRARY(${LIB_NAME} 
    3832    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    39     ${ADD_LIBRARY_HEADERS} 
     33    ${LIB_PUBLIC_HEADERS} 
    4034    AnimationPathManipulator.cpp 
    4135    DriveManipulator.cpp 

  • OpenSceneGraph/trunk/src/osgIntrospection/CMakeLists.txt

    r8201 r8211  
    4040) 
    4141 
    42 IF(APPLE) 
    43     SET(ADD_LIBRARY_HEADERS "") 
    44 ELSEIF(APPLE) 
    45     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    46 ENDIF(APPLE) 
    47  
    4842# FIXME: For OS X, need flag for Framework or dylib 
    4943ADD_LIBRARY(${LIB_NAME} 
    5044    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    51     ${ADD_LIBRARY_HEADERS} 
     45    ${LIB_PUBLIC_HEADERS} 
    5246    ConstructorInfo.cpp 
    5347    CustomAttributeProvider.cpp 

  • OpenSceneGraph/trunk/src/osgManipulator/CMakeLists.txt

    r8201 r8211  
    3333) 
    3434 
    35 IF(APPLE) 
    36     SET(ADD_LIBRARY_HEADERS "") 
    37 ELSEIF(APPLE) 
    38     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    39 ENDIF(APPLE) 
    40  
    4135# FIXME: For OS X, need flag for Framework or dylib 
    4236ADD_LIBRARY(${LIB_NAME} 
    4337    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    44     ${ADD_LIBRARY_HEADERS} 
     38    ${LIB_PUBLIC_HEADERS} 
    4539    AntiSquish.cpp 
    4640    Command.cpp 

  • OpenSceneGraph/trunk/src/osgParticle/CMakeLists.txt

    r8201 r8211  
    5151) 
    5252 
    53 IF(APPLE) 
    54     SET(ADD_LIBRARY_HEADERS "") 
    55 ELSEIF(APPLE) 
    56     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    57 ENDIF(APPLE) 
    58  
    5953# FIXME: For OS X, need flag for Framework or dylib 
    6054ADD_LIBRARY(${LIB_NAME} 
    6155    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    62     ${ADD_LIBRARY_HEADERS} 
     56    ${LIB_PUBLIC_HEADERS} 
    6357    ConnectedParticleSystem.cpp 
    6458    Emitter.cpp 

  • OpenSceneGraph/trunk/src/osgShadow/CMakeLists.txt

    r8201 r8211  
    2121) 
    2222 
    23 IF(APPLE) 
    24     SET(ADD_LIBRARY_HEADERS "") 
    25 ELSEIF(APPLE) 
    26     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    27 ENDIF(APPLE) 
    28  
    2923# FIXME: For OS X, need flag for Framework or dylib 
    3024ADD_LIBRARY(${LIB_NAME} 
    3125    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    32     ${ADD_LIBRARY_HEADERS} 
     26    ${LIB_PUBLIC_HEADERS} 
    3327    OccluderGeometry.cpp 
    3428    ShadowMap.cpp 

  • OpenSceneGraph/trunk/src/osgSim/CMakeLists.txt

    r8201 r8211  
    3535) 
    3636 
    37 IF(APPLE) 
    38     SET(ADD_LIBRARY_HEADERS "") 
    39 ELSEIF(APPLE) 
    40     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    41 ENDIF(APPLE) 
    42  
    4337# FIXME: For OS X, need flag for Framework or dylib 
    4438ADD_LIBRARY(${LIB_NAME} 
    4539    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    46     ${ADD_LIBRARY_HEADERS} 
     40    ${LIB_PUBLIC_HEADERS} 
    4741    BlinkSequence.cpp 
    4842    ColorRange.cpp 

  • OpenSceneGraph/trunk/src/osgTerrain/CMakeLists.txt

    r8201 r8211  
    1919) 
    2020 
    21 IF(APPLE) 
    22     SET(ADD_LIBRARY_HEADERS "") 
    23 ELSEIF(APPLE) 
    24     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    25 ENDIF(APPLE) 
    26  
    2721# FIXME: For OS X, need flag for Framework or dylib 
    2822ADD_LIBRARY(${LIB_NAME} 
    2923    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    30     ${ADD_LIBRARY_HEADERS} 
     24    ${LIB_PUBLIC_HEADERS} 
    3125    Layer.cpp 
    3226    Locator.cpp 

  • OpenSceneGraph/trunk/src/osgText/CMakeLists.txt

    r8201 r8211  
    2121) 
    2222 
    23 IF(APPLE) 
    24     SET(ADD_LIBRARY_HEADERS "") 
    25 ELSEIF(APPLE) 
    26     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    27 ENDIF(APPLE) 
    28  
    2923# FIXME: For OS X, need flag for Framework or dylib 
    3024ADD_LIBRARY(${LIB_NAME} 
    3125    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    32     ${ADD_LIBRARY_HEADERS} 
     26    ${LIB_PUBLIC_HEADERS} 
    3327    DefaultFont.cpp 
    3428    DefaultFont.h 

  • OpenSceneGraph/trunk/src/osgUtil/CMakeLists.txt

    r8201 r8211  
    4949) 
    5050 
    51 IF(APPLE) 
    52     SET(ADD_LIBRARY_HEADERS "") 
    53 ELSEIF(APPLE) 
    54     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ) 
    55 ENDIF(APPLE) 
    56  
    57 # FIXME: For OS X, need flag for Framework or dylib 
    5851ADD_LIBRARY(${LIB_NAME} 
    5952    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    60     ${ADD_LIBRARY_HEADERS} 
     53    ${LIB_PUBLIC_HEADERS} 
    6154    CubeMapGenerator.cpp 
    6255    CullVisitor.cpp 

  • OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

    r8201 r8211  
    8888ENDIF(WIN32) 
    8989 
    90 IF(APPLE) 
    91     SET(ADD_LIBRARY_HEADERS "") 
    92 ELSEIF(APPLE) 
    93     SET(ADD_LIBRARY_HEADERS ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS}) 
    94 ENDIF(APPLE) 
    9590 
    96 # FIXME: For OS X, need flag for Framework or dylib 
    9791ADD_LIBRARY(${LIB_NAME} 
    9892    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} 
    99     ${ADD_LIBRARY_HEADERS} 
     93    ${LIB_PUBLIC_HEADERS} 
     94    ${LIB_PRIVATE_HEADERS} 
    10095    ${LIB_COMMON_FILES} 
    10196)