Changeset 2665 for code/branches/buildsystem3/src/orxonox/objects

Timestamp:

Feb 14, 2009, 11:35:12 PM (16 years ago)

Author:

rgrieder

Message:

Manual merge.

Location:

code/branches/buildsystem3/src/orxonox/objects

Files:

• collisionshapes/CMakeLists.txt (modified) (2 diffs)
• items/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem3/src/orxonox/objects/collisionshapes/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BoxCollisionShape.cc
   CollisionShape.cc
@@ -8 +8 @@
   WorldEntityCollisionShape.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/items/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Item.cc
   Engine.cc
   MultiStateEngine.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)