[Orxonox-commit 3677] r8360 - in code/branches/mac_osx2: . cmake contrib data

[youngk at orxonox.net]

Author: youngk
Date: 2011-04-28 22:27:45 +0200 (Thu, 28 Apr 2011)
New Revision: 8360

Added:
   code/branches/mac_osx2/contrib/mac/
Removed:
   code/branches/mac_osx2/data/mac/
Modified:
   code/branches/mac_osx2/CMakeLists.txt
   code/branches/mac_osx2/cmake/BundleConfig.cmake
   code/branches/mac_osx2/cmake/PrepareDevBundle.cmake
Log:
Moved Apple bundle files to contrib.

Modified: code/branches/mac_osx2/CMakeLists.txt
===================================================================
--- code/branches/mac_osx2/CMakeLists.txt	2011-04-28 16:41:22 UTC (rev 8359)
+++ code/branches/mac_osx2/CMakeLists.txt	2011-04-28 20:27:45 UTC (rev 8360)
@@ -159,6 +159,6 @@
 ########### CPack Packaging ###########
 
 # Currently only testing on Apple
-#IF(APPLE)
-#  INCLUDE(BundleConfig)
-#ENDIF(APPLE)
+IF(APPLE)
+  INCLUDE(BundleConfig)
+ENDIF(APPLE)

Modified: code/branches/mac_osx2/cmake/BundleConfig.cmake
===================================================================
--- code/branches/mac_osx2/cmake/BundleConfig.cmake	2011-04-28 16:41:22 UTC (rev 8359)
+++ code/branches/mac_osx2/cmake/BundleConfig.cmake	2011-04-28 20:27:45 UTC (rev 8360)
@@ -49,7 +49,7 @@
 #SET(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
 
 # Advanced settings
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
   
 # Apple specific settings
 IF(APPLE)

Modified: code/branches/mac_osx2/cmake/PrepareDevBundle.cmake
===================================================================
--- code/branches/mac_osx2/cmake/PrepareDevBundle.cmake	2011-04-28 16:41:22 UTC (rev 8359)
+++ code/branches/mac_osx2/cmake/PrepareDevBundle.cmake	2011-04-28 20:27:45 UTC (rev 8360)
@@ -50,10 +50,10 @@
   FILE(MAKE_DIRECTORY "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}")
   
   # Populate with Info.plist, NIB-file and the Icon.icns
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist" "${DEVBUNDLE_CURRENT_DIR}/Info.plist")
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Icon.icns" "${DEVBUNDLE_CURRENT_RESOURCES}/Icon.icns" COPYONLY)
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" COPYONLY)
-  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)
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings")
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/contrib/mac/Orxonox-Info.plist" "${DEVBUNDLE_CURRENT_DIR}/Info.plist")
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/contrib/mac/Icon.icns" "${DEVBUNDLE_CURRENT_RESOURCES}/Icon.icns" COPYONLY)
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/contrib/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" COPYONLY)
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/contrib/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" COPYONLY)
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/contrib/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings")
 
 ENDFOREACH(_subdir)