Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 26, 2011, 9:41:28 PM (13 years ago)
Author:
rgrieder
Message:

Merged new revisions (8083 - 8125) from mac_osx to kicklib branch.

Location:
code/branches/kicklib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib

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

    r8095 r8129  
    145145  SOURCE_FILES
    146146    Orxonox.cc
     147    OrxonoxMac.mm
    147148  OUTPUT_NAME orxonox
    148149)
     
    178179ENDIF(MSVC)
    179180
     181# Apple Mac OS X specific build settings
     182IF(APPLE)
     183  # On Apple we need to link to AppKit and Foundation frameworks
     184  TARGET_LINK_LIBRARIES(orxonox-main
     185    "-framework AppKit"
     186    "-framework Foundation"
     187  )
     188
     189  # Post-build step for the creation of the Dev-App bundle
     190  INCLUDE(PrepareDevBundle)
     191  ADD_CUSTOM_COMMAND(
     192    TARGET orxonox-main
     193    POST_BUILD
     194    # Copy the Orxonox.app from the dummy location to the correct one
     195    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/Dummy/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app"
     196    # Copy the executable into the Orxonox.app
     197    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
     198    # Copy the dev-build marker file to Orxonox.app
     199    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
     200    # Create a shortcut of the application to the Desktop
     201    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "$ENV{HOME}/Desktop/${PROJECT_NAME}.app"
     202  )
     203ENDIF(APPLE)
     204
    180205#################### Doxygen ####################
    181206
Note: See TracChangeset for help on using the changeset viewer.