[Orxonox-commit 3708] r8388 - in code/branches/mac_osx2: . cmake

[youngk at orxonox.net]

Author: youngk
Date: 2011-05-02 22:30:09 +0200 (Mon, 02 May 2011)
New Revision: 8388

Modified:
   code/branches/mac_osx2/CMakeLists.txt
   code/branches/mac_osx2/cmake/BundleConfig.cmake
Log:
Disabling CPack again. Needs a LOT of adjustments still.

Modified: code/branches/mac_osx2/CMakeLists.txt
===================================================================
--- code/branches/mac_osx2/CMakeLists.txt	2011-05-02 17:58:56 UTC (rev 8387)
+++ code/branches/mac_osx2/CMakeLists.txt	2011-05-02 20:30:09 UTC (rev 8388)
@@ -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-05-02 17:58:56 UTC (rev 8387)
+++ code/branches/mac_osx2/cmake/BundleConfig.cmake	2011-05-02 20:30:09 UTC (rev 8388)
@@ -56,9 +56,9 @@
   SET(CPACK_GENERATOR "Bundle")
 
   SET(CPACK_BUNDLE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-  SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Icon.icns")
-  SET(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist")
-  SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/${DEFAULT_RUNTIME_PATH}/mac/OrxonoxMac")
+  SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/contrib/mac/Icon.icns")
+  SET(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/contrib/mac/Orxonox-Info.plist")
+  #SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/${DEFAULT_RUNTIME_PATH}/mac/OrxonoxMac")
 ENDIF(APPLE)
 
 # Fire up CPack