Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2652 for code/branches


Ignore:
Timestamp:
Feb 13, 2009, 10:16:19 AM (16 years ago)
Author:
rgrieder
Message:
  • Using REGEX "…" EXCLCUDE in INSTALL avoids a call to FILE(GLOB) (quite slow) at CMake (instead of install) time
  • Excluded audio target again (linker tests were successfull so far)
  • Removed unexplainable code I once inserted in cpptcl.cc, didn't experience the problem anymore (was weird behaviour anyway)
  • Sorting out some library depdencies (just a detail)
Location:
code/branches/buildsystem2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem2/cmake/LibraryConfig.cmake

    r2651 r2652  
    6969      # When installing a debug version, we really can't know which libraries
    7070      # are used in released mode because there might be deps of deps.
    71       INSTALL(DIRECTORY ${DEP_BINARY_DIR}/ DESTINATION bin CONFIGURATIONS Debug)
     71      INSTALL(
     72        DIRECTORY ${DEP_BINARY_DIR}/
     73        DESTINATION bin
     74        CONFIGURATIONS Debug
     75        REGEX "^.*\\.pdb$" EXCLUDE
     76      )
    7277
    7378      # Try to filter out all the debug libraries. If the regex doesn't do the
    7479      # job anymore, simply adjust it.
    75       FILE(GLOB _dependencies_all "${DEP_BINARY_DIR}/*")
    76       FOREACH(_dep ${_dependencies_all})
    77         IF(NOT _dep MATCHES "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$")
    78           LIST(APPEND _dependencies_release "${_dep}")
    79         ENDIF()
    80       ENDFOREACH(_dep)
    81       INSTALL(FILES ${_dependencies_release} DESTINATION bin
    82               CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
     80      INSTALL(
     81        DIRECTORY ${DEP_BINARY_DIR}/
     82        DESTINATION bin
     83        CONFIGURATIONS Release RelWithDebInfo MinSizeRel
     84        REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
     85      )
    8386    ENDIF(DEP_BINARY_DIR AND WIN32)
    8487  ENDIF(NOT DEPENDENCY_DIR)

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

    r2650 r2652  
    127127ADD_SUBDIRECTORY(util)
    128128ADD_SUBDIRECTORY(core)
    129 ADD_SUBDIRECTORY(audio)
     129#ADD_SUBDIRECTORY(audio)
    130130ADD_SUBDIRECTORY(network)
    131131ADD_SUBDIRECTORY(orxonox)

  • code/branches/buildsystem2/src/audio/CMakeLists.txt

    r2634 r2652  
    3737ADD_COMPILER_FLAGS("-w44244" MSVC)
    3838
    39 ADD_LIBRARY( audio SHARED ${AUDIO_FILES})
     39ADD_LIBRARY(audio SHARED ${AUDIO_FILES})
    4040SET_TARGET_PROPERTIES(audio PROPERTIES DEFINE_SYMBOL "AUDIO_SHARED_BUILD")
    41 TARGET_LINK_LIBRARIES( audio
     41TARGET_LINK_LIBRARIES(audio
    4242  ${OPENAL_LIBRARY}
    4343  ${ALUT_LIBRARY}

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

    r2651 r2652  
    4040ENDIF()
    4141
    42 TARGET_LINK_LIBRARIES(cpptcl_orxonox
    43   ${TCL_LIBRARY}
    44 )
     42TARGET_LINK_LIBRARIES(cpptcl_orxonox ${TCL_LIBRARY})

  • code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff

    r2641 r2652  
    4747 {
    4848      interp_ =  interp;
    49 @@ -940,6 +952,10 @@
    50       // delete all callbacks that were registered for given interpreter
    51  
    52       {
    53 +          // TODO: why could this probably be necessary? map::find of empty map
    54 +          // shouldn't be a problem.
    55 +          if (callbacks.size() == 0)
    56 +            return;
    57            callback_map::iterator it = callbacks.find(interp);
    58            if (it == callbacks.end())
    59            {
    6049--- cpptcl.h    Wed Jan 28 20:56:11 2009
    6150+++ cpptcl.h    Sat Jan 24 12:52:54 2009

  • code/branches/buildsystem2/src/cpptcl/cpptcl.cc

    r2641 r2652  
    953953
    954954     {
    955           // TODO: why could this probably be necessary? map::find of empty map
    956           // shouldn't be a problem.
    957           if (callbacks.size() == 0)
    958             return;
    959955          callback_map::iterator it = callbacks.find(interp);
    960956          if (it == callbacks.end())

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

    r2643 r2652  
    5959ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
    6060
    61 TARGET_LINK_LIBRARIES( orxonox
     61TARGET_LINK_LIBRARIES(orxonox
    6262  ${OGRE_LIBRARY}
    6363  ${CEGUI_LIBRARY}
    6464  ${LUA_LIBRARIES}
    6565  ${CEGUILUA_LIBRARY}
     66  ${Boost_SYSTEM_LIBRARY}
    6667  ogreceguirenderer_orxonox
    6768  tinyxml++_orxonox
    … …  
    6970  util
    7071  core
     72  network
    7173  #audio
    72   network
    7374)
    7475
Note: See TracChangeset for help on using the changeset viewer.