[Cmake-commits] [cmake-commits] david.cole committed Darwin.cmake 1.49 1.50

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv26983/Modules/Platform

Modified Files:
	Darwin.cmake 
Log Message:
BUG: Fix install_name_tool problem on the Mac when a PROJECT(... NONE) is followed by multiple calls to ENABLE_LANGUAGE. Use find_program to set the CMAKE_INSTALL_NAME_TOOL variable so it gets saved in the cache as a full path to the install_name_tool executable rather than a simple set which eventually goes out of scope.


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.49
retrieving revision 1.50
diff -C 2 -d -r1.49 -r1.50
*** Darwin.cmake	19 Aug 2008 18:23:38 -0000	1.49
--- Darwin.cmake	30 Dec 2008 14:11:54 -0000	1.50
***************
*** 53,57 ****
  # hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
  IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
!   SET(CMAKE_INSTALL_NAME_TOOL install_name_tool)
  ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
  # find installed SDKs
--- 53,57 ----
  # hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
  IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
!   FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL install_name_tool)
  ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
  # find installed SDKs