Changeset 2519

Timestamp:

Dec 21, 2008, 11:06:12 PM (16 years ago)

Author:

rgrieder

Message:

It is no more necessary to include UseTolua.cmake just before the invocation of the TOLUA macro.
The include has been moved to src/CMakeLists.txt

Location:

code/branches/buildsystem2

Files:

• cmake/UseTolua.cmake (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem2/cmake/UseTolua.cmake

@@ -16 +16 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-SET(_tolua_executable_name toluaexe_orxonox)
-GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION)
 IF(MINGW_LIBRARY_DIR)
   SET(_tolua_command_wd "WORKING_DIRECTORY;${MINGW_LIBRARY_DIR}/lua-5.1.3/lib")
@@ -32 +30 @@
   SET(_tolua_cxxfile "${CMAKE_CURRENT_BINARY_DIR}/ToluaBind${_tolua_package}.cc")
   SET(_tolua_hfile   "${CMAKE_CURRENT_BINARY_DIR}/ToluaBind${_tolua_package}.h")
-  SET(${_tolua_srcfiles_varname} ${${_tolua_srcfiles_varname}} "${_tolua_cxxfile}")
+  SET(${_tolua_srcfiles_varname} ${${_tolua_srcfiles_varname}} ${_tolua_cxxfile})
 
   # TODO: check secureness of this temporary file
-  FILE(REMOVE "${_tolua_pkgfile}")
+  FILE(REMOVE ${_tolua_pkgfile})
   FOREACH(_tolua_inputfile ${_tolua_inputfiles})
-    FILE(APPEND "${_tolua_pkgfile}" "\$cfile \"${_tolua_inputfile}\"\n")
+    FILE(APPEND ${_tolua_pkgfile} "\$cfile \"${_tolua_inputfile}\"\n")
   ENDFOREACH(_tolua_inputfile)
 
+  # Note: Some of the variables are already defined in src/tolua/CMakeLists.txt
   ADD_CUSTOM_COMMAND(
-    OUTPUT "${_tolua_cxxfile}" "${_tolua_hfile}"
-    COMMAND "${TOLUA_EXECUTABLE}" -n "${_tolua_package}"
-                                  -w "${CMAKE_CURRENT_SOURCE_DIR}"
-                                  -o "${_tolua_cxxfile}"
-                                  -H "${_tolua_hfile}"
-                                  -s "${TOLUA_PARSER_SOURCE}"
-                                     "${_tolua_pkgfile}"
-    DEPENDS "${_tolua_executable_name}" ${TOLUA_PARSER_DEPENDENCIES}
+    OUTPUT ${_tolua_cxxfile} ${_tolua_hfile}
+    COMMAND ${TOLUA_PARSER_EXECUTABLE} -n ${_tolua_package}
+                                       -w ${CMAKE_CURRENT_SOURCE_DIR}
+                                       -o ${_tolua_cxxfile}
+                                       -H ${_tolua_hfile}
+                                       -s ${TOLUA_PARSER_SOURCE}
+                                          ${_tolua_pkgfile}
+    DEPENDS ${TOLUA_PARSER_DEPENDENCIES}
     IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
     ${_tolua_command_wd}

code/branches/buildsystem2/src/CMakeLists.txt

@@ -53 +53 @@
 ENDIF (WIN32)
 
-# Include macro to easily add source files in subdirectories
+# Include macros
 INCLUDE(AddSourceFiles)
+INCLUDE(UseTolua)
 
 # Our own libraries

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

@@ -47 +47 @@
 WRITE_SOURCE_FILES(CORE_SRC_FILES)
 
-INCLUDE(UseTolua)
 TOLUA(Core CORE_SRC_FILES INPUTFILES LuaBind.h CommandExecutor.h)
 

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

@@ -16 +16 @@
 WRITE_SOURCE_FILES(ORXONOX_SRC_FILES)
 
-INCLUDE(UseTolua)
 TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
 

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

@@ -6 +6 @@
   tolua_to.c
 )
-
-TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
 
 #INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
@@ -27 +25 @@
 ENDIF("${LUA_VERSION}" MATCHES "^5.0")
 
+# Set some variables to the parent scope in order to use them in the TOLUA macro
+GET_TARGET_PROPERTY(_temp_location toluaexe_orxonox LOCATION)
+SET(TOLUA_PARSER_EXECUTABLE ${_temp_location} PARENT_SCOPE)
 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
 SET(TOLUA_PARSER_DEPENDENCIES
+  toluaexe_orxonox
   ${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua