[Orxonox-commit 3374] r8061 - in code/branches/kicklib: cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-12 20:31:51 +0100 (Sat, 12 Mar 2011)
New Revision: 8061

Modified:
   code/branches/kicklib/cmake/tools/FindCEGUI.cmake
   code/branches/kicklib/src/CMakeLists.txt
Log:
Sorted out tolua++ inclusion for newer CEGUI versions.

Modified: code/branches/kicklib/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-12 04:43:12 UTC (rev 8060)
+++ code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-12 19:31:51 UTC (rev 8061)
@@ -65,6 +65,16 @@
   PATH_SUFFIXES lib bin
 )
 
+# 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
   NAMES CEGUItoluapp tolua++
@@ -102,6 +112,7 @@
   CEGUI_INCLUDE_DIR
   CEGUI_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_OPTIMIZED
+  CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   ${CEGUI_OGRE_RENDERER_LIBRARY_NAME}
 )
@@ -120,6 +131,7 @@
   CEGUI_LIBRARY_DEBUG
   CEGUILUA_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_DEBUG
+  CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   CEGUI_TOLUA_LIBRARY_DEBUG
   CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-03-12 04:43:12 UTC (rev 8060)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-03-12 19:31:51 UTC (rev 8061)
@@ -71,6 +71,7 @@
   # External
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
+  ${CEGUI_TOLUA_INCLUDE_DIR}
   #${ENET_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${POCO_INCLUDE_DIR}