Changeset 8653 for code/branches/unity_build/src

Timestamp:

May 28, 2011, 10:40:10 PM (14 years ago)

Author:

rgrieder

Message:

Since we already have it now: use automatic full build units for external dependencies, even in "partial" mode.
That will not actually change anything except that Bullet is now built in a single unit instead of 3.

Location:

code/branches/unity_build/src/external

Files:

• bullet/BulletCollision/CMakeLists.txt (modified) (2 diffs)
• bullet/BulletDynamics/CMakeLists.txt (modified) (2 diffs)
• bullet/CMakeLists.txt (modified) (1 diff)
• bullet/LinearMath/CMakeLists.txt (modified) (2 diffs)
• ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• ois/CMakeLists.txt (modified) (4 diffs)
• tinyxml/CMakeLists.txt (modified) (2 diffs)

code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-BUILD_UNIT BulletCollisionBuildUnit.cpp
 
         BroadphaseCollision/btAxisSweep3.cpp
@@ -84 +82 @@
         NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
         NarrowPhaseCollision/btPersistentManifold.cpp
+        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
         NarrowPhaseCollision/btRaycastCallback.cpp
         NarrowPhaseCollision/btSubSimplexConvexCast.cpp
         NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
 
-END_BUILD_UNIT
-
-    # Raises compiler errors when compiled inside the build unit
-        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
 
         # Headers

code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-BUILD_UNIT BulletDynamicsBuildUnit.cpp
 
         Character/btKinematicCharacterController.cpp
@@ -25 +23 @@
         Vehicle/btRaycastVehicle.cpp
         Vehicle/btWheelInfo.cpp
-
-END_BUILD_UNIT
 
         # Headers

code/branches/unity_build/src/external/bullet/CMakeLists.txt

@@ -32 +32 @@
   VERSION
     2.78
+  EXCLUDE_FROM_BUILD_UNITS
+    BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
   SOURCE_FILES
     ${BULLET_FILES}

code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
 
-BUILD_UNIT BulletLinearMathBuildUnit.cpp
         btAlignedAllocator.cpp
         btConvexHull.cpp
@@ -8 +7 @@
         btQuickprof.cpp
         btSerializer.cpp
-END_BUILD_UNIT
 
         # Headers

code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt

@@ -23 +23 @@
   OgreCEGUITexture.h
 
-BUILD_UNIT OgreCEGUIRendererBuildUnit.cpp
   OgreCEGUIRenderer.cpp
   OgreCEGUIResourceProvider.cpp
   OgreCEGUITexture.cpp
-END_BUILD_UNIT
 )
 

code/branches/unity_build/src/external/ois/CMakeLists.txt

@@ -34 +34 @@
   OISObject.h
   OISPrereqs.h
-)
 
-# Put everything into one single build unit (doens't work on OS X though)
-IF(NOT APPLE)
-  ADD_SOURCE_FILES(OIS_FILES BUILD_UNIT OISBuildUnit.cpp)
-ENDIF()
-
-ADD_SOURCE_FILES(OIS_FILES
   OISEffect.cpp
   OISException.cpp
@@ -50 +43 @@
   OISObject.cpp
 )
+
 IF(WIN32)
   ADD_SUBDIRECTORY(win32)
@@ -58 +52 @@
 ENDIF()
 
-# Close build unit from above
-IF(NOT APPLE)
-  ADD_SOURCE_FILES(OIS_FILES END_BUILD_UNIT)
-ENDIF()
-
 # MinGW doesn't come with some required Windows headers
 IF(MINGW)
   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
+ENDIF()
+
+# Apple has problems with OIS and build units
+IF(APPLE)
+  SET(USE_BUILD_UNITS NO_BUILD_UNITS)
 ENDIF()
 
@@ -82 +76 @@
   LINK_LIBS_LINUX
     X11
+  ${USE_BUILD_UNITS}
   SOURCE_FILES
     ${OIS_FILES}

code/branches/unity_build/src/external/tinyxml/CMakeLists.txt

@@ -24 +24 @@
   tinyxml.h
 
-BUILD_UNIT TicppBuildUnit.cpp
   ticpp.cpp
   tinystr.cpp
@@ -30 +29 @@
   tinyxmlerror.cpp
   tinyxmlparser.cpp
-END_BUILD_UNIT
 )