Changeset 8129 for code/branches/kicklib/cmake

Timestamp:

Mar 26, 2011, 9:41:28 PM (14 years ago)

Author:

rgrieder

Message:

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

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• cmake/BundleConfig.cmake (copied) (copied from code/branches/mac_osx/cmake/BundleConfig.cmake)
• cmake/PackageConfigOSX.cmake (modified) (2 diffs)
• cmake/PrepareDevBundle.cmake (copied) (copied from code/branches/mac_osx/cmake/PrepareDevBundle.cmake)

code/branches/kicklib/cmake/PackageConfigOSX.cmake

@@ -30 +30 @@
 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()
@@ -58 +66 @@
 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/