Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7224


Ignore:
Timestamp:
Aug 26, 2010, 3:00:27 PM (14 years ago)
Author:
rgrieder
Message:

Adjusted CMake code to accept the new v5 dependencies that requires the POCO library.

Location:
code/trunk
Files:
1 added
3 edited

Legend:

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

    r7163 r7224  
    9191FIND_PACKAGE(ALUT            REQUIRED)
    9292FIND_PACKAGE(ZLIB            REQUIRED)
     93IF(POCO_REQUIRED)
     94  FIND_PACKAGE(POCO          REQUIRED)
     95ENDIF()
    9396IF(WIN32)
    9497  FIND_PACKAGE(DirectX       REQUIRED)
    95 ENDIF(WIN32)
     98ENDIF()
    9699
    97100##### CEGUI #####
  • code/trunk/cmake/PackageConfig.cmake

    r6765 r7224  
    7171ENDIF()
    7272
     73# Ogre versions >= 1.7 require the POCO library on Windows for threading
     74COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
     75IF(NOT _result EQUAL -1)
     76    SET(POCO_REQUIRED TRUE)
     77ENDIF()
     78
    7379# Include paths and other special treatments
    7480SET(ENV{ALUTDIR}               ${DEP_INCLUDE_DIR}/freealut)
     
    8389SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
    8490SET(ENV{OPENALDIR}             ${DEP_INCLUDE_DIR}/openal)
     91SET(ENV{POCODIR}               ${DEP_INCLUDE_DIR}/poco)
    8592LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/tcl/include)
    8693LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/zlib/include)
  • code/trunk/src/CMakeLists.txt

    r7163 r7224  
    7474  ${ENET_INCLUDE_DIR}
    7575  ${Boost_INCLUDE_DIRS}
     76  ${POCO_INCLUDE_DIR}
    7677  ${OPENAL_INCLUDE_DIRS}
    7778  ${ALUT_INCLUDE_DIR}
Note: See TracChangeset for help on using the changeset viewer.