Changeset 1755 for code/trunk/cmake

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• cmake/FindLua.cmake (modified) (2 diffs)

code/trunk/cmake/FindCEGUI.cmake

@@ -39 +39 @@
 SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIR} CACHE PATH "")
 SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
+SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule" CACHE STRING "")
 SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
 

code/trunk/cmake/FindLua.cmake

@@ -48 +48 @@
     # Found newer lua 5.1 libs
     SET(Lua_FOUND TRUE)
-    SET(Lua_VERSION 5.1 CACHE STRING "")
+    SET(Lua_VERSION "5.1" CACHE STRING "")
     SET(Lua_INCLUDE_DIR ${Lua_INCLUDE_DIR_51} CACHE PATH "")
     SET(Lua_LIBRARIES ${Lua_LIBRARY_51} CACHE FILEPATH "")
@@ -56 +56 @@
     # Found older lua 5.0 libs
     SET(Lua_FOUND TRUE)
-    SET(Lua_VERSION 5.0 CACHE STRING "")
+    SET(Lua_VERSION "5.0" CACHE STRING "")
     SET(Lua_INCLUDE_DIR ${Lua_INCLUDE_DIR_50} CACHE PATH "")
     SET(Lua_LIBRARIES ${Lua_LIBRARY_1_50} ${Lua_LIBRARY_2_50} CACHE FILEPATH "")