Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9687


Ignore:
Timestamp:
Oct 3, 2013, 11:34:34 PM (11 years ago)
Author:
landauf
Message:

support precompiled dependencies v7.0 for mingw (which use boost for threading in ogre)

Location:
code/trunk/cmake
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/LibraryConfig.cmake

    r8412 r9687  
    177177ELSEIF(OGRE_NEEDS_BOOST)
    178178  # Always link against boost too because of threading
    179   SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY})
     179  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
    180180ENDIF()
    181181
  • code/trunk/cmake/PackageConfig.cmake

    r8405 r9687  
    3333COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
    3434IF(NOT _result EQUAL -1 AND NOT APPLE)
    35   SET(OGRE_NEEDS_POCO TRUE)
     35  # In dependency package 7 poco is not used anymore - instead we use boost
     36  COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 7 _result TRUE)
     37  IF(NOT _result EQUAL -1)
     38    SET(OGRE_NEEDS_BOOST TRUE)
     39  ELSE()
     40    SET(OGRE_NEEDS_POCO TRUE)
     41  ENDIF()
    3642ENDIF()
    3743
  • code/trunk/cmake/PackageConfigMinGW.cmake

    r8351 r9687  
    2929
    3030  INCLUDE(CheckPackageVersion)
    31   CHECK_PACKAGE_VERSION(6.0)
     31  CHECK_PACKAGE_VERSION(6.0 7.0)
    3232
    3333  # 64 bit system?
Note: See TracChangeset for help on using the changeset viewer.