Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8349


Ignore:
Timestamp:
Apr 28, 2011, 2:47:09 AM (13 years ago)
Author:
youngk
Message:

The Mac OS X dependency package is now downloaded and installed automatically, once cmake is run. Very convenient.

Location:
code/branches/kicklib2/cmake
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib2/cmake/LibraryConfig.cmake

    r8285 r8349  
    5050
    5151IF(DEPENDENCY_PACKAGE_ENABLE)
     52  # Let CMake automatically download and extract the dependency package on Mac OS X
     53  # TODO: Handle download errors and always select newest package
     54  SET(_dep_package_current "OrxonoxDeps_110428_2.0_OSX.tar.bz2")
     55  SET(_dep_package_url "http://svn.orxonox.net/ogre/apple/precompiled_dependencies")
     56  IF(APPLE AND NOT EXISTS ${CMAKE_SOURCE_DIR}/dependencies)
     57    MESSAGE(STATUS "Downloading Mac OS X dependency package.")
     58    FILE(DOWNLOAD
     59      ${_dep_package_url}/${_dep_package_current}
     60      ${CMAKE_SOURCE_DIR}/${_dep_package_current}
     61    )
     62    MESSAGE(STATUS "Extracting Mac OS X dependency package.")
     63    EXECUTE_PROCESS(
     64      COMMAND ${CMAKE_COMMAND} -E tar -jxf ${_dep_package_current}
     65      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     66      OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_extract_log.keep_me
     67    )
     68    # Delete the dependency archive once we no longer need it
     69    FILE(REMOVE ${CMAKE_SOURCE_DIR}/${_dep_package_current})
     70  ENDIF()
     71
    5272  GET_FILENAME_COMPONENT(_dep_dir_1 ${CMAKE_SOURCE_DIR}/../dependencies ABSOLUTE)
    5373  GET_FILENAME_COMPONENT(_dep_dir_2 ${CMAKE_SOURCE_DIR}/../lib_dist ABSOLUTE)
  • code/branches/kicklib2/cmake/PackageConfigOSX.cmake

    r8348 r8349  
    3333  # The following shell script sets the appropriate install_names for our libraries
    3434  # and therefore it must be run before anything else is set, dep-package-wise.
    35   EXECUTE_PROCESS(
    36     COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh
    37     WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR}
    38     OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me
    39   )
     35  IF(NOT EXISTS ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me)
     36    MESSAGE(STATUS "Installing Mac OS X dependency package to current dir.")
     37    EXECUTE_PROCESS(
     38      COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh
     39      WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR}
     40      OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me
     41    )
     42  ENDIF()
    4043  SET(_INTERNAL_PACKAGE_MESSAGE 1 CACHE INTERNAL "Do not edit!" FORCE)
    4144ENDIF()
Note: See TracChangeset for help on using the changeset viewer.