Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2670


Ignore:
Timestamp:
Feb 15, 2009, 7:53:22 PM (16 years ago)
Author:
rgrieder
Message:
  • Added version info (written by the linker) to all libraries
  • Target dependency bugfix for msvc in doc/api
  • Fixed possibly non existent html directory when installing docs
  • Merged the three Bullet libraries into a single one
  • No warnings at all from third party libraries
  • Performance tweak in ceguilua CMake files
Location:
code/branches/buildsystem3
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem3/doc/api/CMakeLists.txt

    r2664 r2670  
    6565      STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
    6666      ADD_CUSTOM_TARGET(chmdoc ${HTML_HELP_COMPILER} ${HHP_FILE})
    67       IF(NOT MSVC)
    68         ADD_DEPENDENCIES(chmdoc doc)
    69       ELSE(NOT MSVC)
    70         # Do not add the dependency because msvc will then always build
    71         # Doxygen, which is not very comforting.
    72       ENDIF(NOT MSVC)
     67      ADD_DEPENDENCIES(chmdoc doc)
     68      # Adding a dependency somehow adds doc target as default build target
     69      SET_TARGET_PROPERTIES(doc chmdoc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
    7370    ENDIF(HTML_HELP_COMPILER)
    7471  ENDIF (WIN32)
    … …  
    8178    OPTIONAL
    8279  )
    83   IF(EXISTS ${CMAAKE_CURRENT_BINARY_DIR}/html)
    84     INSTALL(
    85       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
    86       DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
    87     )
     80  # Install command always needs the directory to work
     81  IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html)
     82    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html)
    8883  ENDIF()
     84  INSTALL(
     85    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
     86    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
     87  )
    8988ENDIF(DOXYGEN_FOUND)

  • code/branches/buildsystem3/media/CMakeLists.txt

    r2666 r2670  
    4141################ Installation #################
    4242
     43# Try no to copy both tcl script file libraries
     44IF(TCL_LIBRARY MATCHES "85|8\\.5")
     45  SET(TCL_EXCLUDE_PATTERN "tcl8\\.4")
     46ELSEIF(TCL_LIBRARY MATCHES "84|8\\.4")
     47  SET(TCL_EXCLUDE_PATTERN "tcl8\\.5")
     48ENDIF()
     49
    4350INSTALL(
    4451  DIRECTORY ${ORXONOX_MEDIA_DIRECTORY}/
    4552  DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
    46   REGEX "\\.svn$|_svn$" EXCLUDE
     53  REGEX "\\.svn$|_svn$|backToPNG|${TCL_EXCLUDE_PATTERN}" EXCLUDE
    4754)

  • code/branches/buildsystem3/src/CMakeLists.txt

    r2664 r2670  
    133133ADD_SUBDIRECTORY(network)
    134134ADD_SUBDIRECTORY(orxonox)
     135
     136# Apply version info
     137SET_TARGET_PROPERTIES(util core network orxonox
     138  PROPERTIES VERSION ${ORXONOX_VERSION})

  • code/branches/buildsystem3/src/bullet/BulletCollision/CMakeLists.txt

    r2662 r2670  
    1 SET(BulletCollision_SRCS
     1ADD_SOURCE_FILES(BULLET_FILES
    22        BroadphaseCollision/btAxisSweep3.cpp
    33        BroadphaseCollision/btBroadphaseProxy.cpp
    … …  
    1010        BroadphaseCollision/btQuantizedBvh.cpp
    1111        BroadphaseCollision/btSimpleBroadphase.cpp
     12
    1213        CollisionDispatch/btActivatingCollisionAlgorithm.cpp
    1314        CollisionDispatch/btCollisionDispatcher.cpp
    … …  
    3031        CollisionDispatch/btUnionFind.cpp
    3132        CollisionDispatch/SphereTriangleDetector.cpp
     33
    3234        CollisionShapes/btBoxShape.cpp
    3335        CollisionShapes/btBvhTriangleMeshShape.cpp
    … …  
    6365        CollisionShapes/btTriangleMeshShape.cpp
    6466        CollisionShapes/btUniformScalingShape.cpp
     67
    6568        Gimpact/btContactProcessing.cpp
    6669        Gimpact/btGImpactShape.cpp
    … …  
    7477        Gimpact/btGImpactQuantizedBvh.cpp
    7578        Gimpact/gim_box_set.cpp
     79
    7680        NarrowPhaseCollision/btContinuousConvexCollision.cpp
    7781        NarrowPhaseCollision/btGjkEpa2.cpp
    … …  
    8589        NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    8690        NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
     91
     92        # Headers
     93        BroadphaseCollision/btAxisSweep3.h
     94        BroadphaseCollision/btBroadphaseInterface.h
     95        BroadphaseCollision/btBroadphaseProxy.h
     96        BroadphaseCollision/btCollisionAlgorithm.h
     97        BroadphaseCollision/btDispatcher.h
     98        BroadphaseCollision/btDbvtBroadphase.h
     99        BroadphaseCollision/btDbvt.h
     100        BroadphaseCollision/btMultiSapBroadphase.h
     101        BroadphaseCollision/btOverlappingPairCache.h
     102        BroadphaseCollision/btOverlappingPairCallback.h
     103        BroadphaseCollision/btQuantizedBvh.h
     104        BroadphaseCollision/btSimpleBroadphase.h
     105
     106        CollisionDispatch/btActivatingCollisionAlgorithm.h
     107        CollisionDispatch/btCollisionConfiguration.h
     108        CollisionDispatch/btCollisionCreateFunc.h
     109        CollisionDispatch/btCollisionDispatcher.h
     110        CollisionDispatch/btCollisionObject.h
     111        CollisionDispatch/btCollisionWorld.h
     112        CollisionDispatch/btCompoundCollisionAlgorithm.h
     113        CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
     114        CollisionDispatch/btDefaultCollisionConfiguration.h
     115        CollisionDispatch/btSphereSphereCollisionAlgorithm.h
     116        CollisionDispatch/btBoxBoxCollisionAlgorithm.h
     117        CollisionDispatch/btBoxBoxDetector.h
     118        CollisionDispatch/btGhostObject.h
     119        CollisionDispatch/btSphereBoxCollisionAlgorithm.h
     120        CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
     121        CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
     122        CollisionDispatch/btConvexConvexAlgorithm.h
     123        CollisionDispatch/btEmptyCollisionAlgorithm.h
     124        CollisionDispatch/btManifoldResult.h
     125        CollisionDispatch/btSimulationIslandManager.h
     126        CollisionDispatch/btUnionFind.h
     127        CollisionDispatch/SphereTriangleDetector.h
     128
     129        CollisionShapes/btBoxShape.h
     130        CollisionShapes/btBvhTriangleMeshShape.h
     131        CollisionShapes/btCapsuleShape.h
     132        CollisionShapes/btCollisionMargin
     133        CollisionShapes/btCollisionShape.h
     134        CollisionShapes/btCompoundShape.h
     135        CollisionShapes/btConcaveShape.h
     136        CollisionShapes/btConeShape.h
     137        CollisionShapes/btConvexHullShape.h
     138        CollisionShapes/btConvexPointCloudShape.h
     139        CollisionShapes/btConvexShape.h
     140        CollisionShapes/btConvexInternalShape.h
     141        CollisionShapes/btConvexTriangleMeshShape.h
     142        CollisionShapes/btCylinderShape.h
     143        CollisionShapes/btEmptyShape.h
     144        CollisionShapes/btHeightfieldTerrainShape.h
     145        CollisionShapes/btMinkowskiSumShape.h
     146        CollisionShapes/btMaterial.h
     147        CollisionShapes/btMultimaterialTriangleMeshShape.h
     148        CollisionShapes/btMultiSphereShape.h
     149        CollisionShapes/btOptimizedBvh.h
     150        CollisionShapes/btPolyhedralConvexShape.h
     151        CollisionShapes/btScaledBvhTriangleMeshShape.h
     152        CollisionShapes/btTetrahedronShape.h
     153        CollisionShapes/btSphereShape.h
     154        CollisionShapes/btShapeHull.h
     155        CollisionShapes/btStaticPlaneShape.h
     156        CollisionShapes/btStridingMeshInterface.h
     157        CollisionShapes/btTriangleCallback.h
     158        CollisionShapes/btTriangleBuffer.h
     159        CollisionShapes/btTriangleIndexVertexArray.h
     160        CollisionShapes/btTriangleIndexVertexMaterialArray.h
     161        CollisionShapes/btTriangleMesh.h
     162        CollisionShapes/btTriangleMeshShape.h
     163        CollisionShapes/btUniformScalingShape.h
     164
     165        Gimpact/btGImpactShape.h
     166        Gimpact/gim_contact.h
     167        Gimpact/btGImpactBvh.h
     168        Gimpact/btGenericPoolAllocator.h
     169        Gimpact/gim_memory.h
     170        Gimpact/btGImpactCollisionAlgorithm.h
     171        Gimpact/btTriangleShapeEx.h
     172        Gimpact/gim_tri_collision.h
     173        Gimpact/btGImpactQuantizedBvh.h
     174        Gimpact/gim_box_set.h
     175
     176        NarrowPhaseCollision/btContinuousConvexCollision.h
     177        NarrowPhaseCollision/btConvexCast.h
     178        NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
     179        NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
     180        NarrowPhaseCollision/btGjkConvexCast.h
     181        NarrowPhaseCollision/btGjkEpa2.h
     182        NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
     183        NarrowPhaseCollision/btGjkPairDetector.h
     184        NarrowPhaseCollision/btManifoldPoint.h
     185        NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
     186        NarrowPhaseCollision/btPersistentManifold.h
     187        NarrowPhaseCollision/btPointCollector.h
     188        NarrowPhaseCollision/btRaycastCallback.h
     189        NarrowPhaseCollision/btSimplexSolverInterface.h
     190        NarrowPhaseCollision/btSubSimplexConvexCast.h
     191        NarrowPhaseCollision/btVoronoiSimplexSolver.h
    87192)
    88 
    89 ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS})

  • code/branches/buildsystem3/src/bullet/BulletDynamics/CMakeLists.txt

    r2662 r2670  
    1 SET(BulletDynamics_SRCS
     1ADD_SOURCE_FILES(BULLET_FILES
    22        ConstraintSolver/btContactConstraint.cpp
    33        ConstraintSolver/btConeTwistConstraint.cpp
    … …  
    99        ConstraintSolver/btSolve2LinearConstraint.cpp
    1010        ConstraintSolver/btTypedConstraint.cpp
     11
    1112        Dynamics/Bullet-C-API.cpp
    1213        Dynamics/btDiscreteDynamicsWorld.cpp
    1314        Dynamics/btSimpleDynamicsWorld.cpp
    1415        Dynamics/btRigidBody.cpp
     16
    1517        Vehicle/btRaycastVehicle.cpp
    1618        Vehicle/btWheelInfo.cpp
     19
    1720        Character/btKinematicCharacterController.cpp
     21
     22        # Headers
     23        ConstraintSolver/btConstraintSolver.h
     24        ConstraintSolver/btContactConstraint.h
     25        ConstraintSolver/btContactSolverInfo.h
     26        ConstraintSolver/btConeTwistConstraint.h
     27        ConstraintSolver/btGeneric6DofConstraint.h
     28        ConstraintSolver/btHingeConstraint.h
     29        ConstraintSolver/btJacobianEntry.h
     30        ConstraintSolver/btPoint2PointConstraint.h
     31        ConstraintSolver/btSequentialImpulseConstraintSolver.h
     32        ConstraintSolver/btSliderConstraint.h
     33        ConstraintSolver/btSolve2LinearConstraint.h
     34        ConstraintSolver/btSolverBody.h
     35        ConstraintSolver/btSolverConstraint.h
     36        ConstraintSolver/btTypedConstraint.h
     37
     38        Dynamics/btContinuousDynamicsWorld.h
     39        Dynamics/btDiscreteDynamicsWorld.h
     40        Dynamics/btDynamicsWorld.h
     41        Dynamics/btSimpleDynamicsWorld.h
     42        Dynamics/btRigidBody.h
     43
     44        Vehicle/btRaycastVehicle.h
     45        Vehicle/btVehicleRaycaster.h
     46        Vehicle/btWheelInfo.h
     47
     48        Character/btCharacterControllerInterface.h
     49        Character/btKinematicCharacterController.h
    1850)
    19 
    20 ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS})

  • code/branches/buildsystem3/src/bullet/CMakeLists.txt

    r2662 r2670  
     1 #
     2 #             ORXONOX - the hottest 3D action shooter ever to exist
     3 #                             > www.orxonox.net <
     4 #
     5 #        This program is free software; you can redistribute it and/or
     6 #         modify it under the terms of the GNU General Public License
     7 #        as published by the Free Software Foundation; either version 2
     8 #            of the License, or (at your option) any later version.
     9 #
     10 #       This program is distributed in the hope that it will be useful,
     11 #        but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 #                 GNU General Public License for more details.
     14 #
     15 #   You should have received a copy of the GNU General Public License along
     16 #      with this program; if not, write to the Free Software Foundation,
     17 #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     18 #
     19
     20SET_SOURCE_FILES(BULLET_FILES
     21  btBulletCollisionCommon.h
     22  btBulletDynamicsCommon.h
     23  Bullet-C-Api.h
     24)
    125ADD_SUBDIRECTORY(BulletCollision)
    226ADD_SUBDIRECTORY(BulletDynamics)
    327ADD_SUBDIRECTORY(LinearMath)
     28
     29GENERATE_SOURCE_GROUPS(${BULLET_FILES})
     30
     31# No warnings needed from third party libraries
     32ADD_COMPILER_FLAGS("-w")
     33
     34IF(MSVC)
     35  ADD_LIBRARY(bullet_orxonox STATIC ${BULLET_FILES})
     36ELSE(MSVC)
     37  ADD_LIBRARY(bullet_orxonox SHARED ${BULLET_FILES})
     38  ORXONOX_INSTALL(bullet_orxonox)
     39ENDIF(MSVC)
     40
     41SET_TARGET_PROPERTIES(bullet_orxonox PROPERTIES VERSION 2.73)

  • code/branches/buildsystem3/src/bullet/LinearMath/CMakeLists.txt

    r2662 r2670  
    1 SET(LinearMath_SRCS
     1ADD_SOURCE_FILES(BULLET_FILES
    22                btConvexHull.cpp
    33                btQuickprof.cpp
    44                btGeometryUtil.cpp
    55                btAlignedAllocator.cpp
     6
     7                # Headers
     8                btAlignedObjectArray.h
     9                btList.h
     10                btPoolAllocator.h
     11                btRandom.h
     12                btVector3.h
     13                btDefaultMotionState.h
     14                btMatrix3x3.h
     15                btQuadWord.h
     16                btHashMap.h
     17                btScalar.h
     18                btAabbUtil2.h
     19                btConvexHull.h
     20                btMinMax.h
     21                btQuaternion.h
     22                btStackAlloc.h
     23                btGeometryUtil.h
     24                btMotionState.h
     25                btTransform.h
     26                btAlignedAllocator.h
     27                btIDebugDraw.h
     28                btQuickprof.h
     29                btTransformUtil.h
    630)
    7 
    8 ADD_LIBRARY(LinearMath ${LinearMath_SRCS})

  • code/branches/buildsystem3/src/ceguilua/CMakeLists.txt

    r2664 r2670  
    3636# Copy package files incrementally until the version is met
    3737SET(CEGUILUA_VERSIONS 0.5.0 0.6.0 0.6.1 0.6.2)
    38 FOREACH(_version ${CEGUILUA_VERSIONS})
    39   COMPARE_VERSION_STRINGS(${_version} ${CEGUI_VERSION} _compare_result)
    40   IF(_compare_result EQUAL 1)
    41     BREAK() # _version > CEGUI_VERSION
    42   ENDIF()
     38# Only copy on version change
     39IF(NOT "${_CEGUI_VERSION_REF}" STREQUAL "${CEGUI_VERSION}"
     40   OR NOT EXISTS ${CEGUILUA_BINARY_DIR}/exceptions.lua)
     41  SET(_CEGUI_VERSION_REF ${CEGUI_VERSION} CACHE INTERNAL "Do not edit")
     42  FOREACH(_version ${CEGUILUA_VERSIONS})
     43    COMPARE_VERSION_STRINGS(${_version} ${CEGUI_VERSION} _compare_result)
     44    IF(_compare_result EQUAL 1)
     45      BREAK() # _version > CEGUI_VERSION
     46    ENDIF()
    4347 
    44   ADD_SUBDIRECTORY(ceguilua-${_version}) # Sets parent scope variable
    45   FOREACH(_file ${_package_files})
    46     CONFIGURE_FILE(ceguilua-${_version}/package/${_file} ${CEGUILUA_BINARY_DIR}/${_file} COPYONLY)
    47   ENDFOREACH(_file)
    48 ENDFOREACH(_version)
     48    ADD_SUBDIRECTORY(ceguilua-${_version}) # Sets parent scope variable _package_files
     49    FOREACH(_file ${_package_files})
     50      CONFIGURE_FILE(ceguilua-${_version}/package/${_file} ${CEGUILUA_BINARY_DIR}/${_file} COPYONLY)
     51    ENDFOREACH(_file)
     52  ENDFOREACH(_version)
     53ENDIF()
    4954
    5055# Create the tolua bind file. We could use the orignal file though, but it is 1.6MB...
    … …  
    6267)
    6368
    64 ADD_COMPILER_FLAGS("-w44996" MSVC)
     69# No warnings needed from third party libraries
     70ADD_COMPILER_FLAGS("-w")
    6571
    6672SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES})
    … …  
    7682)
    7783
     84SET_TARGET_PROPERTIES(ceguilua_orxonox PROPERTIES VERSION ${CEGUI_VERSION})
     85
    7886ORXONOX_INSTALL(ceguilua_orxonox)

  • code/branches/buildsystem3/src/cpptcl/CMakeLists.txt

    r2664 r2670  
    3333GENERATE_SOURCE_GROUPS(${CPPTCL_FILES})
    3434
     35# No warnings needed from third party libraries
     36ADD_COMPILER_FLAGS("-w")
     37
    3538IF(MSVC)
    3639  ADD_LIBRARY(cpptcl_orxonox STATIC ${CPPTCL_FILES})
    … …  
    4144
    4245TARGET_LINK_LIBRARIES(cpptcl_orxonox ${TCL_LIBRARY})
     46
     47SET_TARGET_PROPERTIES(cpptcl_orxonox PROPERTIES VERSION 1.1.3)

  • code/branches/buildsystem3/src/ogreceguirenderer/CMakeLists.txt

    r2664 r2670  
    2929GENERATE_SOURCE_GROUPS(${OCR_FILES})
    3030
     31# No warnings needed from third party libraries
     32ADD_COMPILER_FLAGS("-w")
     33
    3134ADD_LIBRARY(ogreceguirenderer_orxonox SHARED ${OCR_FILES})
    3235SET_TARGET_PROPERTIES(ogreceguirenderer_orxonox PROPERTIES DEFINE_SYMBOL "OGRE_GUIRENDERER_EXPORTS")
    … …  
    3639)
    3740
     41SET_TARGET_PROPERTIES(ogreceguirenderer_orxonox PROPERTIES VERSION 1.4.9)
     42
    3843ORXONOX_INSTALL(ogreceguirenderer_orxonox)

  • code/branches/buildsystem3/src/ois/CMakeLists.txt

    r2664 r2670  
    5252GENERATE_SOURCE_GROUPS(${OIS_FILES})
    5353
     54# No warnings needed from third party libraries
     55ADD_COMPILER_FLAGS("-w")
     56# Multibyte character required for OIS
    5457REMOVE_COMPILER_FLAGS("-DUNICODE -D_UNICODE" MSVC)
     58
    5559INCLUDE_DIRECTORIES(.)
    5660
    … …  
    6266ENDIF()
    6367
     68SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES VERSION 1.2)
     69
    6470ORXONOX_INSTALL(ois_orxonox)

  • code/branches/buildsystem3/src/orxonox/CMakeLists.txt

    r2664 r2670  
    6969  tinyxml++_orxonox
    7070  tolua++_orxonox
    71   BulletDynamics
    72   BulletCollision
    73   LinearMath
     71  bullet_orxonox
    7472  util
    7573  core

  • code/branches/buildsystem3/src/tinyxml/CMakeLists.txt

    r2664 r2670  
    3232GENERATE_SOURCE_GROUPS(${TINYXML++_FILES})
    3333
     34# No warnings needed from third party libraries
     35ADD_COMPILER_FLAGS("-w")
     36
    3437IF(MSVC)
    3538  ADD_LIBRARY(tinyxml++_orxonox STATIC ${TINYXML++_FILES})
    … …  
    3841  ORXONOX_INSTALL(tinyxml++_orxonox)
    3942ENDIF()
     43
     44SET_TARGET_PROPERTIES(tinyxml++_orxonox PROPERTIES VERSION 2.5.3)

  • code/branches/buildsystem3/src/tinyxml/VERSION

    r2664 r2670  
    1 TinyXML++ trunk checkout revision 98.
     1TinyXML++ trunk checkout revision 98. Built on top of TinyXML 2.5.3

  • code/branches/buildsystem3/src/tolua/CMakeLists.txt

    r2664 r2670  
    3232GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
    3333
    34 ADD_COMPILER_FLAGS("-w44996" MSVC)
     34# No warnings needed from third party libraries
     35ADD_COMPILER_FLAGS("-w")
    3536
    3637ADD_LIBRARY(tolua++_orxonox SHARED ${TOLUA++_FILES})
    3738SET_TARGET_PROPERTIES(tolua++_orxonox PROPERTIES DEFINE_SYMBOL "TOLUA_SHARED_BUILD")
    3839TARGET_LINK_LIBRARIES(tolua++_orxonox ${LUA_LIBRARIES})
     40
     41SET_TARGET_PROPERTIES(tolua++_orxonox PROPERTIES VERSION 1.0.92)
    3942
    4043ORXONOX_INSTALL(tolua++_orxonox)
Note: See TracChangeset for help on using the changeset viewer.