Changeset 998 for code/branches

Timestamp:

Apr 6, 2008, 1:25:44 AM (17 years ago)

Author:

rgrieder

Message:

• tried to find liblua —> not fixed yet

Location:

code/branches/script

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindLua.cmake (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (2 diffs)
• src/util/tolua (moved) (moved from code/branches/script/src/util/tolua++)

code/branches/script/CMakeLists.txt

@@ -72 +72 @@
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Lua)
-FIND_PACKAGE(ToLua)
+#FIND_PACKAGE(ToLua)
 
 #Sets the search paths for the linking

code/branches/script/cmake/FindLua.cmake

@@ -23 +23 @@
         /usr/local/lib)
 
-IF (NOT Lua_LIBRARIES AND Lua_INCLUDE_DIR)
+IF (NOT Lua_INCLUDE_DIR)
 FIND_PATH(Lua_INCLUDE_DIR lua.h
         /usr/include/lua50
         /usr/local/include/lua50
         /usr/pack/lua-5.0.3-sd/include/)
+ENDIF (NOT Lua_INCLUDE_DIR)
+MESSAGE(STATUS ${Lua_INCLUDE_DIR})
 
-FIND_LIBRARY(Lua_LIBRARIES lua50
+IF (NOT Lua_LIBRARIES)
+FIND_LIBRARY(Lua_LIBRARIES lua50 liblua
         /usr/lib
         /usr/local/lib
         /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/)
 
-FIND_LIBRARY(Lua_LIBRARY lualib50
+FIND_LIBRARY(Lua_LIBRARY lualib50 liblualib
         /usr/lib
         /usr/local/lib
         /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/)
 
+MESSAGE(STATUS ${Lua_LIBRARY})
+MESSAGE(STATUS ${Lua_LIBRARIES})
+
 SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
 
-ENDIF (NOT Lua_LIBRARIES AND Lua_INCLUDE_DIR)
+ENDIF (NOT Lua_LIBRARIES)
 
 IF (Lua_INCLUDE_DIR AND Lua_LIBRARIES)

code/branches/script/src/util/CMakeLists.txt

@@ -2 +2 @@
 
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-AUX_SOURCE_DIRECTORY(tolua++ TOLUA++_SRC_FILES)
+AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)
 
 SET (UTIL_SRC_FILES
@@ -12 +12 @@
   MultiTypeMath.cc
   ${TINYXML_SRC_FILES}
-  $(TOLUA++_SRC_FILES)
+  ${TOLUA_SRC_FILES}
 )