Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8123


Ignore:
Timestamp:
Mar 26, 2011, 5:42:23 PM (13 years ago)
Author:
rgrieder
Message:

Cleaned up threading library linking for OGRE. please test.

Location:
code/branches/kicklib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/cmake/LibraryConfig.cmake

    r8073 r8123  
    9898# Performs the search and sets the variables    #
    9999
    100 FIND_PACKAGE(OGRE     1.6    REQUIRED)
    101 #FIND_PACKAGE(ENet     1.1    REQUIRED)
     100#FIND_PACKAGE(ENet     1.2    REQUIRED)
     101FIND_PACKAGE(CEGUI    0.6    REQUIRED)
    102102FIND_PACKAGE(Lua5.1          REQUIRED)
    103103FIND_PACKAGE(Ogg             REQUIRED)
     
    105105FIND_PACKAGE(ALUT            REQUIRED)
    106106FIND_PACKAGE(ZLIB            REQUIRED)
    107 IF(POCO_REQUIRED)
    108   FIND_PACKAGE(POCO          REQUIRED)
    109   # Always link against POCO too because of threading
    110   SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
    111 ENDIF()
     107
    112108IF(WIN32)
    113109  FIND_PACKAGE(DbgHelp)
     
    115111ENDIF()
    116112
    117 ##### CEGUI #####
    118 # We make use of the CEGUI script module called CEGUILua.
    119 # However there is a small issue with that: Both CEGUILua and Orxonox use
    120 # Lua library functions on the same objects. And it turns out that in this case
    121 # the linked library must be EXACTLY the same.
    122 # Since Lua v5.1 has been out for a long while, this does not seem to be a
    123 # problem anymore, at least as long as Lua 5.2 is not released.
    124 FIND_PACKAGE(CEGUI 0.6 REQUIRED)
    125113
    126114##### OpenAL #####
     
    165153ENDIF()
    166154
     155##### OGRE #####
     156FIND_PACKAGE(OGRE 1.6 REQUIRED)
     157# For Ogre >= 1.7, we might need a threading library
     158# Variables are either defined by dependency package config or by FindOGRE
     159IF(OGRE_NEEDS_POCO)
     160  FIND_PACKAGE(POCO REQUIRED)
     161  # Always link against POCO too because of threading
     162  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
     163ELSEIF(OGRE_NEEDS_BOOST)
     164  # Always link against boost too because of threading
     165  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY})
     166ENDIF()
     167
    167168
    168169####### Static/Dynamic linking options ##########
  • code/branches/kicklib/cmake/PackageConfig.cmake

    r8071 r8123  
    3333COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
    3434IF(NOT _result EQUAL -1 AND NOT APPLE)
    35   SET(POCO_REQUIRED TRUE)
     35  SET(OGRE_NEEDS_POCO TRUE)
    3636ENDIF()
    3737
  • code/branches/kicklib/cmake/PackageConfigOSX.cmake

    r8121 r8123  
    4949SET(ENV{OGRE_PLUGIN_DIR} ${DEP_BINARY_DIR})
    5050
     51# Linking to OGRE requires linking to the boost threading library
     52SET(OGRE_NEEDS_BOOST TRUE)
     53
    5154# For OS X 10.5 we have to ship modified headers to make it compile
    5255# on gcc >= 4.2 (binaries stay the same)
  • code/branches/kicklib/src/external/ogreceguirenderer/CMakeLists.txt

    r8071 r8123  
    3535    "OGRE_GUIRENDERER_EXPORTS"
    3636  LINK_LIBRARIES
    37     ${Boost_SYSTEM_LIBRARY}
    38     ${Boost_THREAD_LIBRARY}
    39     ${Boost_DATE_TIME_LIBRARY}
    4037    ${OGRE_LIBRARY}
    4138    ${CEGUI_LIBRARY}
Note: See TracChangeset for help on using the changeset viewer.