Changeset 8216 for code/branches/kicklib
- Timestamp:
- Apr 9, 2011, 7:08:25 PM (14 years ago)
- Location:
- code/branches/kicklib
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib
- Property svn:mergeinfo changed
/code/branches/mac_osx merged: 8135
- Property svn:mergeinfo changed
-
code/branches/kicklib/cmake/PrepareDevBundle.cmake
r8129 r8216 25 25 26 26 IF(APPLE) 27 IF(NOT CMAKE_CONFIGURATION_TYPES) 28 SET(_subdirs .) 29 SET(_default_subdir .) 30 ELSE() 31 SET(_subdirs ${CMAKE_CONFIGURATION_TYPES}) 32 SET(_default_subdir) # No default subdir 33 ENDIF() 34 35 FOREACH(_subdir ${_subdirs}) 36 GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_subdir} ABSOLUTE) 37 27 38 # Convenience variables 28 # Note that this is just an empty bundle! It will be copied into the29 # corresponding directoryat build time30 SET(DEVBUNDLE_CURRENT_DIR "${C MAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/Dummy/${PROJECT_NAME}.app/Contents")39 # Note that this is just an empty bundle! The executable itself will 40 # be added at build time 41 SET(DEVBUNDLE_CURRENT_DIR "${CURRENT_RUNTIME_DIR}/${PROJECT_NAME}.app/Contents") 31 42 SET(DEVBUNDLE_CURRENT_BIN "${DEVBUNDLE_CURRENT_DIR}/MacOS") 32 43 SET(DEVBUNDLE_CURRENT_RESOURCES "${DEVBUNDLE_CURRENT_DIR}/Resources") … … 46 57 CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" COPYONLY) 47 58 CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings") 59 60 ENDFOREACH(_subdir) 48 61 ENDIF(APPLE) -
code/branches/kicklib/src/CMakeLists.txt
r8130 r8216 198 198 TARGET orxonox-main 199 199 POST_BUILD 200 # Copy the Orxonox.app from the dummy location to the correct one201 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"202 200 # Copy the executable into the Orxonox.app 203 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"201 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS" 204 202 # Copy the dev-build marker file to Orxonox.app 205 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"206 # Create a shortcut of the application to the Desktop207 COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_ BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "$ENV{HOME}/Desktop/${PROJECT_NAME}.app"203 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS" 204 # Create a shortcut of the application to the root of the build tree 205 COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app" 208 206 ) 209 207 ENDIF(APPLE)
Note: See TracChangeset
for help on using the changeset viewer.