Changeset 8061

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:

• cmake/tools/FindCEGUI.cmake (modified) (3 diffs)
• src/CMakeLists.txt (modified) (1 diff)

code/branches/kicklib/cmake/tools/FindCEGUI.cmake

@@ -66 +66 @@
 )
 
+# Find CEGUI Tolua++ include file
+# We only need to add this path since we use tolua++ like a normal
+# dependency but it is shipped with CEGUI.
+FIND_PATH(CEGUI_TOLUA_INCLUDE_DIR tolua++.h
+  PATHS
+    ${CEGUI_INCLUDE_DIR}
+    # For newer CEGUI versions >= 0.7
+    ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule/support/tolua++
+  NO_DEFAULT_PATH # Has to be in a CEGUI_INCLUDE_DIR somewhere
+)
 # Find CEGUI Tolua++ libraries
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
@@ -103 +113 @@
   CEGUI_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_OPTIMIZED
+  CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   ${CEGUI_OGRE_RENDERER_LIBRARY_NAME}
@@ -121 +132 @@
   CEGUILUA_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_DEBUG
+  CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   CEGUI_TOLUA_LIBRARY_DEBUG

code/branches/kicklib/src/CMakeLists.txt

@@ -72 +72 @@
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
+  ${CEGUI_TOLUA_INCLUDE_DIR}
   #${ENET_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}