Changeset 103 for osgVisual


Ignore:
Timestamp:
Jul 29, 2010, 9:39:24 PM (14 years ago)
Author:
Torben Dannhauer
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/CMakeLists.txt

    r102 r103  
    2424#SET(CMAKE_MODULE_PATH "${osgVisual_SOURCE_DIR}/../CMakeModules;${CMAKE_MODULE_PATH}")
    2525
    26 #INCLUDE( CheckTypeSize )
    27 #CHECK_TYPE_SIZE( "void*" SIZE_OF_VOID_P )
     26# Check Architecture
    2827IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
    2928    MESSAGE( STATUS "32 bit architecture detected" )
     
    3635
    3736
    38 # Get OSG Settings
     37# Get requiered packages
    3938IF(DESTINATION_ARCH STREQUAL "x64")
    4039        SET(OSG_ROOT_BKP $ENV{OSG_ROOT})        # BACKUP old OSG_ROOT
     
    4544FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
    4645FIND_PACKAGE(OpenGL REQUIRED)
     46IF(UNIX)
     47        FIND_PACKAGE(PTHREAD REQUIRED)
     48ENDIF(UNIX)
     49
     50
     51
    4752
    4853IF(DESTINATION_ARCH STREQUAL "x64")
     
    122127                SET(SILVERLINING_LICENSEE "Your user name" CACHE STRING "Enter your Silverlining licensee name. If you license available, osgVisual will work with silverlining as 5 minute demo with the default value." )
    123128                SET(SILVERLINING_LICENSE "Your license code" CACHE STRING "Enter your Silverlining license key. If you license available, osgVisual will work with silverlining as 5 minute demo with the default value." )
    124                 INCLUDE_DIRECTORIES(${SILVERLINING_INCLUDE_DIR} include/sky_Silverlining)
     129                INCLUDE_DIRECTORIES(${SILVERLINING_INCLUDE_DIR} "include/sky_Silverlining" ${PTHREAD_INCLUDE_DIR} )
    125130                ADD_DEFINITIONS( "-DUSE_SKY_SILVERLINING" )
    126131                ADD_DEFINITIONS( "-DSILVERLINING_LICENSEE=\"${SILVERLINING_LICENSEE}\"" )
     
    348353
    349354# Linking
    350 #IF(WIN32)
    351 #       TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} "OpenGL32.lib")
    352 #ENDIF(WIN32)
    353 #IF(UNIX)
    354 #       TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} "libGL.so")
    355 #ENDIF(UNIX)
    356355TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES})
    357356
    358357
    359358IF(USE_SKY_SILVERLINING )
    360         TARGET_LINK_LIBRARIES(osgVisual "winmm.lib" debug ${SILVERLINING_LIBRARY_DEBUG} optimized ${SILVERLINING_LIBRARY_RELEASE})
     359        IF(WIN32)
     360                TARGET_LINK_LIBRARIES(osgVisual "winmm.lib")
     361        ENDIF(WIN32)
     362        IF(UNIX)
     363                TARGET_LINK_LIBRARIES(osgVisual ${PTHREAD_LIBRARIES})
     364        ENDIF(UNIX)
     365        TARGET_LINK_LIBRARIES(osgVisual debug ${SILVERLINING_LIBRARY_DEBUG} optimized ${SILVERLINING_LIBRARY_RELEASE})
    361366ENDIF(USE_SKY_SILVERLINING)
    362367               
Note: See TracChangeset for help on using the changeset viewer.