[Orxonox-commit 3408] r8095 - in code/branches/kicklib: cmake/tools src

rgrieder at orxonox.net rgrieder at orxonox.net
Sat Mar 19 15:10:26 CET 2011


Author: rgrieder
Date: 2011-03-19 15:10:26 +0100 (Sat, 19 Mar 2011)
New Revision: 8095

Modified:
   code/branches/kicklib/cmake/tools/FindCEGUI.cmake
   code/branches/kicklib/src/CMakeLists.txt
Log:
Add CEGUIua include directory for CEGUI version below 0.7

Modified: code/branches/kicklib/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-19 13:58:11 UTC (rev 8094)
+++ code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-19 14:10:26 UTC (rev 8095)
@@ -119,6 +119,7 @@
     CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
   )
 ELSE()
+  SET(CEGUI_OLD_VERSION TRUE)
   SET(CEGUI_OGRE_RENDERER_BUILD_REQUIRED TRUE)
 ENDIF()
 

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-03-19 13:58:11 UTC (rev 8094)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-03-19 14:10:26 UTC (rev 8095)
@@ -95,6 +95,10 @@
   ${ZLIB_INCLUDE_DIR}
 )
 
+IF(CEGUI_OLD_VERSION)
+  INCLUDE_DIRECTORIES(${CEGUILUA_INCLUDE_DIR})
+ENDIF()
+
 IF (DBGHELP_FOUND)
   INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
 ENDIF()




More information about the Orxonox-commit mailing list