Changeset 2519 for code/branches/buildsystem2/src

Timestamp:

Dec 21, 2008, 11:06:12 PM (15 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/src

Files:

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

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