Changeset 5873 for code/branches/core5

Timestamp:

Oct 4, 2009, 8:03:26 PM (15 years ago)

Author:

rgrieder

Message:

Added a few more compilations in our own libraries.
Also fixed a bug in tools/CMakeLists.txt (ADD instead of SET_SOURCE_FILES caused the list of files to grow every cmake run, but REMOVE_DUPLICATES took care of it anyway).

Location:

code/branches/core5/src

Files:

• libraries/CMakeLists.txt (modified) (1 diff)
• libraries/core/CMakeLists.txt (modified) (4 diffs)
• libraries/network/packet/CMakeLists.txt (modified) (2 diffs)
• libraries/tools/CMakeLists.txt (modified) (3 diffs)
• libraries/util/CMakeLists.txt (modified) (1 diff)
• modules/pong/CMakeLists.txt (modified) (3 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/graphics/CMakeLists.txt (modified) (1 diff)
• orxonox/overlays/CMakeLists.txt (modified) (1 diff)

code/branches/core5/src/libraries/CMakeLists.txt

@@ -25 +25 @@
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(util)

code/branches/core5/src/libraries/core/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(CORE_SRC_FILES
-  ConfigFileManager.cc
   ConfigValueContainer.cc
   Core.cc
@@ -32 +31 @@
   Language.cc
   LuaState.cc
-  MemoryArchive.cc
   ObjectListBase.cc
   OrxonoxClass.cc
-  PathConfig.cc
   Resource.cc
   ScopedSingletonManager.cc
@@ -41 +38 @@
 
   # command
-  ArgumentCompletionFunctions.cc
   CommandEvaluation.cc
   CommandExecutor.cc
@@ -67 +63 @@
   Shell.cc
   TclBind.cc
-  TclThreadManager.cc
+
+COMPILATION_BEGIN FilesystemCompilation.cc
+  ArgumentCompletionFunctions.cc
+  ConfigFileManager.cc
+  MemoryArchive.cc
+  PathConfig.cc
+COMPILATION_END
 
   # multithreading
+  ThreadPool.cc
+COMPILATION_BEGIN ThreadCompilation.cc
+  TclThreadManager.cc
   Thread.cc
-  ThreadPool.cc
+COMPILATION_END
 )
+
 ADD_SUBDIRECTORY(input)
 

code/branches/core5/src/libraries/network/packet/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(NETWORK_SRC_FILES
+COMPILATION_BEGIN PacketCompilation.cc
   Acknowledgement.cc
   Chat.cc
@@ -9 +10 @@
   Packet.cc
   Welcome.cc
+COMPILATION_END
 )
 

code/branches/core5/src/libraries/tools/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(TOOLS_SRC_FILES
+SET_SOURCE_FILES(TOOLS_SRC_FILES
+COMPILATION_BEGIN ResourceCompilation.cc
+  ResourceCollection.cc
+  ResourceLocation.cc
+COMPILATION_END
+  TextureGenerator.cc
+  Timer.cc
+COMPILATION_BEGIN OgreCompilation.cc
   BillboardSet.cc
   DynamicLines.cc
@@ -5 +12 @@
   Mesh.cc
   ParticleInterface.cc
-  ResourceCollection.cc
-  ResourceLocation.cc
   Shader.cc
-  TextureGenerator.cc
-  Timer.cc
+COMPILATION_END
 )
 ADD_SUBDIRECTORY(interfaces)
@@ -15 +19 @@
 ORXONOX_ADD_LIBRARY(tools
   FIND_HEADER_FILES
-  PCH_FILE
-    ToolsPrecompiledHeaders.h
   DEFINE_SYMBOL
     "TOOLS_SHARED_BUILD"

code/branches/core5/src/libraries/util/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(UTIL_SRC_FILES
+  Exception.cc
+  Math.cc
+  MultiType.cc
+  Scope.cc
+  StringUtils.cc
+COMPILATION_BEGIN StableCompilation.cc
   Clipboard.cc
   Clock.cc
   CRC32.cc
-  Exception.cc
   ExprParser.cc
-  Math.cc
-  MultiType.cc
   OutputBuffer.cc
   OutputHandler.cc
-  Scope.cc
   SignalHandler.cc
   Sleep.cc
-  StringUtils.cc
   SubString.cc
+COMPILATION_END
 )
 

code/branches/core5/src/modules/pong/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(PONG_SRC_FILES
+#COMPILATION_BEGIN PongCompilation.cc
   Pong.cc
   PongAI.cc
@@ -7 +8 @@
   PongCenterpoint.cc
   PongScore.cc
+#COMPILATION_END
 )
 
@@ -12 +14 @@
   MODULE
   FIND_HEADER_FILES
-  PCH_FILE
-    PongPrecompiledHeaders.h
-  PCH_NO_DEFAULT
   DEFINE_SYMBOL
     "PONG_SHARED_BUILD"

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

@@ -25 +25 @@
 
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
+  Level.cc
+  LevelManager.cc
   Main.cc
-
-  CameraManager.cc
-  LevelManager.cc
   PawnManager.cc
   PlayerManager.cc
-
-  Level.cc
   Radar.cc
+COMPILATION_BEGIN SceneCompilation.cc
+  CameraManager.cc
   Scene.cc
+COMPILATION_END
 )
 

code/branches/core5/src/orxonox/graphics/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  Backlight.cc
   Billboard.cc
   BlinkingBillboard.cc
-  Camera.cc
   FadingBillboard.cc
   GlobalShader.cc
-  Light.cc
   Model.cc
   ParticleEmitter.cc
   ParticleSpawner.cc
+COMPILATION_BEGIN GraphicsCompilation.cc
+  Backlight.cc
+  Camera.cc
+  Light.cc
+COMPILATION_END
 )

code/branches/core5/src/orxonox/overlays/CMakeLists.txt

@@ -3 +3 @@
   OverlayGroup.cc
 
+COMPILATION_BEGIN OverlayCompilation.cc
   InGameConsole.cc
   Map.cc
+COMPILATION_END
 )