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

Timestamp:

Jan 29, 2009, 11:35:54 PM (16 years ago)

Author:

rgrieder

Message:

This commit gets a little ugly, couldn't separate that anymore:

• Renamed UseTolua.cmake to GenerateLuaBindings.cmake
• Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
• Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
• Large scale clean up in BuildConfig.cmake
• You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
• Lots of small changes and fixes

File:

• code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified) (3 diffs)

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

@@ -1 @@
-ADD_C_FLAGS("-wd4996" MSVC)
+################### Tolua++ library ###################
 
-ADD_LIBRARY(tolualib_orxonox SHARED
+SET(TOLUA++_FILES
+  tolua_event.h
+  tolua++.h
+
   tolua_event.c
   tolua_is.c
@@ -8 +11 @@
   tolua_to.c
 )
-SET_TARGET_PROPERTIES(tolualib_orxonox PROPERTIES DEFINE_SYMBOL "TOLUA_SHARED_BUILD")
-TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
+GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
+
+ADD_COMPILER_FLAGS("-w44996" MSVC)
+
+ADD_LIBRARY(tolua++_orxonox SHARED ${TOLUA++_FILES})
+SET_TARGET_PROPERTIES(tolua++_orxonox PROPERTIES DEFINE_SYMBOL "TOLUA_SHARED_BUILD")
+TARGET_LINK_LIBRARIES(tolua++_orxonox ${LUA_LIBRARIES})
 
 IF (NOT WIN32)
@@ -15 +23 @@
 ENDIF (NOT WIN32)
 
-SET(TOLUAGEN_SRC_FILES
-  tolua.c
-)
 
-ADD_EXECUTABLE(toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
-TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
+################## Tolua++ generator ##################
 
-#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")
+ADD_EXECUTABLE(tolua++app_orxonox tolua.c)
+TARGET_LINK_LIBRARIES(tolua++app_orxonox tolua++_orxonox ${LUA_LIBRARIES})
 
 # Set some variables to the cache in order to use them in the TOLUA macro
-SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" CACHE INTERNAL "")
+SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
 SET(TOLUA_PARSER_DEPENDENCIES
-  toluaexe_orxonox
-  ${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}
+  tolua++app_orxonox
+  ${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua