Changeset 1148

Timestamp:

Apr 23, 2008, 10:55:28 PM (17 years ago)

Author:

rgrieder

Message:

• tolua working directory is now bin/lib/ again
• commented dependency code in cmake for tolua_bind.*, has yet to be tested on windows cmake.

Location:

code/branches/cmake/src

Files:

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

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

@@ -27 +27 @@
   Script.cc
   tolua/tolua_bind.cc
-  tolua/tolua_bind.h
+#tolua/tolua_bind.h
 )
 
-SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
-  PROPERTIES
-  OBJECT_DEPENDS tolua/tolua_bind.h
-  OBJECT_DEPENDS tolua/tolua_bind.cc
-  GENERATED true
-  HEADER_FILE_ONLY true
-)
+#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
+#  PROPERTIES
+#  OBJECT_DEPENDS tolua/tolua_bind.h
+#  OBJECT_DEPENDS tolua/tolua_bind.cc
+#  GENERATED true
+#  HEADER_FILE_ONLY true
+#)
 
 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT tolua/tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n core -o core/tolua/tolua_bind.cc -H core/tolua/tolua_bind.h core/tolua/tolua.pkg
+  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
+  COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
   DEPENDS tolua
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
 

code/branches/cmake/src/core/tolua/tolua.pkg

@@ -1 @@
-$cfile "core/Script_clean.h"
+$cfile "../../src/core/Script_clean.h"

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

@@ -31 +31 @@
 #  objects/weapon/WeaponStation.cc
   tolua/tolua_bind.cc
-  tolua/tolua_bind.h
+#  tolua/tolua_bind.h
 )
 
-SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
-  PROPERTIES
-  OBJECT_DEPENDS tolua/tolua_bind.h
-  OBJECT_DEPENDS tolua/tolua_bind.cc
-  GENERATED true
-  HEADER_FILE_ONLY true
-)
+#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
+#  PROPERTIES
+#  OBJECT_DEPENDS tolua/tolua_bind.h
+#  OBJECT_DEPENDS tolua/tolua_bind.cc
+#  GENERATED true
+#  HEADER_FILE_ONLY true
+#)
 
 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT tolua/tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n orxonox -o orxonox/tolua/tolua_bind.cc -H orxonox/tolua/tolua_bind.h orxonox/tolua/tolua.pkg
+  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
+  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
   DEPENDS tolua
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )