Changeset 2236 for code/branches/buildsystem/cmake

Timestamp:

Nov 20, 2008, 8:51:44 PM (16 years ago)

Author:

rgrieder

Message:

• Changed working directory for tolua generator to library_output_path. That resolves windows issues with dlls.
• Removed the need to create a second tolua application. There is only one now called toluaexe_orxonox.
• 'w' (working directory) option of tolua extends to -L, pkg-file, -o and -H if of course -w is present
• 's' option added to tolua: Tells which file contains the bindfile generator. In our case this is src/tolua/all.lua all.lua replaces tolua-5.1.pkg. We can still choose that file from CMake (TOLUA_PARSER_SOURCE)
• Generator dependencies are declared in src/tolua/CMakeLists.txt and used in UseTolua.cmake (PARENT_SCOPE)
• Fixed a bug when writing the header file inclusion in package.lua

File:

• code/branches/buildsystem/cmake/UseTolua.cmake (modified) (3 diffs)

code/branches/buildsystem/cmake/UseTolua.cmake

@@ -16 +16 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-SET(_tolua_executable_name tolua_orxonox)
+SET(_tolua_executable_name toluaexe_orxonox)
 GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION)
 
@@ -33 +33 @@
   SET(_tolua_pkgfile "${CMAKE_CURRENT_BINARY_DIR}/tolua.pkg")
   SET(_tolua_cxxfile "${CMAKE_CURRENT_BINARY_DIR}/tolua_bind.cc")
-  SET(_tolua_hfile "${CMAKE_CURRENT_BINARY_DIR}/tolua_bind.h")
+  SET(_tolua_hfile   "${CMAKE_CURRENT_BINARY_DIR}/tolua_bind.h")
   SET(${_tolua_srcfiles_varname} ${${_tolua_srcfiles_varname}} "${_tolua_cxxfile}")
 
@@ -44 +44 @@
   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}" "${_tolua_pkgfile}"
-    DEPENDS "${_tolua_executable_name}" ${_tolua_inputfiles}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    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_inputfiles} ${TOLUA_PARSER_DEPENDENCIES}
+    WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}"
   )
 ENDMACRO(TOLUA)