Changeset 4

Show
Ignore:
Timestamp:
07/31/07 16:58:57
Author:
robert
Message:

From Martin Lavery, add osgGA and OpenThreads? to CMake build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CMakeModules/FindOSG.cmake

    r1 r4  
    7777    ) 
    7878    IF( NOT ${MYLIBRARY}_DEBUG) 
    79        IF(MYLIBRARY) 
    80                SET(${MYLIBRARY}_DEBUG ${MYLIBRARY}) 
    81        ENDIF(MYLIBRARY) 
     79        IF(MYLIBRARY) 
     80            SET(${MYLIBRARY}_DEBUG ${MYLIBRARY}) 
     81         ENDIF(MYLIBRARY) 
    8282    ENDIF( NOT ${MYLIBRARY}_DEBUG) 
    83                 
     83            
    8484ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME) 
    8585 
    8686FIND_OSG_LIBRARY(OSG_LIBRARY osg) 
     87FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA) 
    8788FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil) 
    8889FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB) 

  • trunk/src/CMakeLists.txt

    r3 r4  
    22 
    33INCLUDE_DIRECTORIES( ${OSG_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) 
    4 SET(TARGET_ADDED_LIBRARIES ${OSG_LIBRARY} ${OSGUTIL_LIBRARY} ${OSGDB_LIBRARY} ${OSGGA_LIBRARY} ${OSGVIEWER_LIBRARY} ${OSGTEXT_LIBRARY} ${OSGFX_LIBRARY} ${OSGVIEWER_LIBRARY} ${SDL_LIBRARY} ${LIBXML2_LIBRARIES}) 
     4SET(TARGET_ADDED_LIBRARIES ${OSG_LIBRARY} ${OPENTHREADS_LIBRARY} ${OSGUTIL_LIBRARY} ${OSGDB_LIBRARY} ${OSGGA_LIBRARY} ${OSGVIEWER_LIBRARY} ${OSGTEXT_LIBRARY} ${OSGFX_LIBRARY} ${OSGVIEWER_LIBRARY} ${SDL_LIBRARY} ${LIBXML2_LIBRARIES}) 
    55 
    66SET(TARGET_H