Changeset 921

Show
Ignore:
Timestamp:
08/04/08 19:29:59
Author:
robert
Message:

Cleaned up output of OSG_ vars

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CMakeModules/FindOSG.cmake

    r920 r921  
    8585FIND_OSG_LIBRARY( OSGSIM_LIBRARY osgSim ) 
    8686FIND_OSG_LIBRARY( OSGVIEWER_LIBRARY osgViewer ) 
    87 FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA) 
    88 FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads) 
     87FIND_OSG_LIBRARY( OSGGA_LIBRARY osgGA) 
     88FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY OpenThreads) 
    8989 
    90 MESSAGE( "--=====>>>> $ENV{OSG_DIR}") 
    91 MESSAGE( "--=====>>>> $ENV{OSGDIR}") 
    9290SET( OSG_FOUND "NO" ) 
    9391IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) 
    9492    SET( OSG_FOUND "YES" ) 
    95     SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) 
     93     
     94    IF (${OSG_INCLUDE_DIR} STREQUAL ${OSG_GEN_INCLUDE_DIR}) 
     95        SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR}) 
     96    ELSE (${OSG_INCLUDE_DIR} STREQUAL ${OSG_GEN_INCLUDE_DIR}) 
     97        SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) 
     98    ENDIF (${OSG_INCLUDE_DIR} STREQUAL ${OSG_GEN_INCLUDE_DIR}) 
     99     
    96100    GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH ) 
     101    MESSAGE("-- OSG_LIBRARIES_DIR: " ${OSG_LIBRARIES_DIR}) 
     102    MESSAGE("-- OSG_INCLUDE_DIRS: " ${OSG_INCLUDE_DIRS}) 
    97103ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) 
    98 MESSAGE( "--=====>>>> ${OSG_INCLUDE_DIRS}") 
    99104 
    100105