Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8061 for code/branches/kicklib


Ignore:
Timestamp:
Mar 12, 2011, 8:31:51 PM (14 years ago)
Author:
rgrieder
Message:

Sorted out tolua++ inclusion for newer CEGUI versions.

Location:
code/branches/kicklib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/cmake/tools/FindCEGUI.cmake

    r7960 r8061  
    6666)
    6767
     68# Find CEGUI Tolua++ include file
     69# We only need to add this path since we use tolua++ like a normal
     70# dependency but it is shipped with CEGUI.
     71FIND_PATH(CEGUI_TOLUA_INCLUDE_DIR tolua++.h
     72  PATHS
     73    ${CEGUI_INCLUDE_DIR}
     74    # For newer CEGUI versions >= 0.7
     75    ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule/support/tolua++
     76  NO_DEFAULT_PATH # Has to be in a CEGUI_INCLUDE_DIR somewhere
     77)
    6878# Find CEGUI Tolua++ libraries
    6979FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
     
    103113  CEGUI_LIBRARY_OPTIMIZED
    104114  CEGUILUA_LIBRARY_OPTIMIZED
     115  CEGUI_TOLUA_INCLUDE_DIR
    105116  CEGUI_TOLUA_LIBRARY_OPTIMIZED
    106117  ${CEGUI_OGRE_RENDERER_LIBRARY_NAME}
     
    121132  CEGUILUA_LIBRARY_OPTIMIZED
    122133  CEGUILUA_LIBRARY_DEBUG
     134  CEGUI_TOLUA_INCLUDE_DIR
    123135  CEGUI_TOLUA_LIBRARY_OPTIMIZED
    124136  CEGUI_TOLUA_LIBRARY_DEBUG
  • code/branches/kicklib/src/CMakeLists.txt

    r8057 r8061  
    7272  ${OGRE_INCLUDE_DIR}
    7373  ${CEGUI_INCLUDE_DIR}
     74  ${CEGUI_TOLUA_INCLUDE_DIR}
    7475  #${ENET_INCLUDE_DIR}
    7576  ${Boost_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.