Changeset 2510 for code/branches/buildsystem2/src/tolua

Timestamp:

Dec 17, 2008, 9:05:10 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 2279-2401 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (1 prop)
• src/tolua/CMakeLists.txt (modified) (3 diffs)
• src/tolua/all-5.0.lua (modified) (1 prop)
• src/tolua/all-5.1.lua (modified) (1 prop)

code/branches/buildsystem2/src/tolua/CMakeLists.txt

@@ -1 @@
-SET(TOLUALIB_SRC_FILES
+ADD_LIBRARY(tolualib_orxonox STATIC
   tolua_event.c
   tolua_is.c
@@ -7 +7 @@
 )
 
-ADD_LIBRARY          (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
 TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
 
+#INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
 
 SET(TOLUAGEN_SRC_FILES
@@ -15 +15 @@
 )
 
-ADD_EXECUTABLE       (toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
+ADD_EXECUTABLE(toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
 TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
 
-# TODO: determine lua version and set appropriate pack file
-SET(TOLUA_ALL_PACK all-5.1.lua)
+#IF("${LUA_VERSION}" VERSION_LESS 5.1)
+IF("${LUA_VERSION}" MATCHES "^5.0")
+  SET(TOLUA_ALL_PACK all-5.0.lua)
+#ELSE("${LUA_VERSION}" VERSION_LESS 5.1)
+ELSE("${LUA_VERSION}" MATCHES "^5.0")
+  SET(TOLUA_ALL_PACK all-5.1.lua)
+#ENDIF("${LUA_VERSION}" VERSION_LESS 5.1)
+ENDIF("${LUA_VERSION}" MATCHES "^5.0")
+
 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
 SET(TOLUA_PARSER_DEPENDENCIES