[Orxonox-commit 3438] r8125 - code/branches/mac_osx/cmake

[youngk at orxonox.net]

Author: youngk
Date: 2011-03-26 21:00:35 +0100 (Sat, 26 Mar 2011)
New Revision: 8125

Modified:
   code/branches/mac_osx/cmake/PackageConfigOSX.cmake
Log:
The dependency package now installs itself automatically on Macs

Modified: code/branches/mac_osx/cmake/PackageConfigOSX.cmake
===================================================================
--- code/branches/mac_osx/cmake/PackageConfigOSX.cmake	2011-03-26 18:09:38 UTC (rev 8124)
+++ code/branches/mac_osx/cmake/PackageConfigOSX.cmake	2011-03-26 20:00:35 UTC (rev 8125)
@@ -29,6 +29,14 @@
 
 IF(NOT _INTERNAL_PACKAGE_MESSAGE)
   MESSAGE(STATUS "Using library package for the dependencies.")
+  
+  # The following shell script sets the appropriate install_names for our libraries
+  # and therefore it must be run before anything else is set, dep-package-wise.
+  EXECUTE_PROCESS(
+    COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh
+    WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR}
+    OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me 
+  )
   SET(_INTERNAL_PACKAGE_MESSAGE 1 CACHE INTERNAL "Do not edit!" FORCE)
 ENDIF()
 
@@ -57,18 +65,11 @@
   SET(ENV{OPENALDIR} ${DEP_INCLUDE_DIR}/openal)
 ENDIF()
 
-# Xcode won't be able to run the toluabind code generation if we're using the dependency package
-#IF(DEPENDENCY_PACKAGE_ENABLE)
-#  IF(${CMAKE_GENERATOR} STREQUAL "Xcode")
-#    SET(ENV{DYLD_LIBRARY_PATH}               ${DEPENDENCY_PACKAGE_DIR}/lib)
-#    SET(ENV{DYLD_FRAMEWORK_PATH}             ${DEPENDENCY_PACKAGE_DIR}/Library/Frameworks)
-#  ENDIF(${CMAKE_GENERATOR} STREQUAL "Xcode")
-#ENDIF(DEPENDENCY_PACKAGE_ENABLE)
-
 ### INSTALL ###
 
 # Tcl script library
 # TODO: How does this work on OS X?
+# Concerning all OS X install procedures: use CPACK
 #INSTALL(
 #  DIRECTORY ${DEP_LIBRARY_DIR}/tcl/
 #  DESTINATION lib/tcl