Changeset 2664 for code/branches/buildsystem3/src/orxonox/objects/weaponSystem

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) (1 diff)

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

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Munition.cc
   Weapon.cc
@@ -8 +8 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES munitions)
-ADD_SOURCE_DIRECTORY(SRC_FILES projectiles)
-ADD_SOURCE_DIRECTORY(SRC_FILES weapons)
-
-ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(munitions)
+ADD_SUBDIRECTORY(projectiles)
+ADD_SUBDIRECTORY(weapons)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   LaserGunMunition.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc
   Projectile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Fusion.cc
   LaserGun.cc
 #  Missile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)