[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.45.2.3 1.45.2.4 Haiku.cmake 1.1.2.2 1.1.2.3 WindowsPaths.cmake 1.5 1.5.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin.cmake Haiku.cmake WindowsPaths.cmake 
Log Message:
ENH: merge fixes for RC 6


Index: Haiku.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Haiku.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** Haiku.cmake	24 Oct 2008 15:20:35 -0000	1.1.2.2
--- Haiku.cmake	31 Dec 2008 15:14:29 -0000	1.1.2.3
***************
*** 13,14 ****
--- 13,20 ----
  
  INCLUDE(Platform/UnixPaths)
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include)
+ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib)
+ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
+ 

Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** WindowsPaths.cmake	16 Jan 2008 14:51:57 -0000	1.5
--- WindowsPaths.cmake	31 Dec 2008 15:14:29 -0000	1.5.2.1
***************
*** 1,14 ****
  GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
  GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
  
! # List common installation prefixes.  These will be used for all
! # search types.
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-   "$ENV{ProgramFiles}"
- 
-   # CMake install location
-   "${_CMAKE_INSTALL_DIR}"
- 
    # Project install destination.
    "${CMAKE_INSTALL_PREFIX}"
--- 1,55 ----
+ # Add the program-files folder(s) to the list of installation
+ # prefixes.
+ #
+ # Windows 64-bit Binary:
+ #   ENV{ProgramFiles(x86)} = [C:\Program Files (x86)]
+ #   ENV{ProgramFiles} = [C:\Program Files]
+ #   ENV{ProgramW6432} = <not set>
+ # (executed from cygwin):
+ #   ENV{ProgramFiles(x86)} = <not set>
+ #   ENV{ProgramFiles} = [C:\Program Files]
+ #   ENV{ProgramW6432} = <not set>
+ #
+ # Windows 32-bit Binary:
+ #   ENV{ProgramFiles(x86)} = [C:\Program Files (x86)]
+ #   ENV{ProgramFiles} = [C:\Program Files (x86)]
+ #   ENV{ProgramW6432} = [C:\Program Files]
+ # (executed from cygwin):
+ #   ENV{ProgramFiles(x86)} = <not set>
+ #   ENV{ProgramFiles} = [C:\Program Files (x86)]
+ #   ENV{ProgramW6432} = [C:\Program Files]
+ IF(DEFINED "ENV{ProgramW6432}")
+   # 32-bit binary on 64-bit windows.
+   # The 64-bit program files are in ProgramW6432.
+   LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramW6432}")
+ 
+   # The 32-bit program files are in ProgramFiles.
+   IF(DEFINED "ENV{ProgramFiles}")
+     LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles}")
+   ENDIF()
+ ELSE()
+   # 64-bit binary, or 32-bit binary on 32-bit windows.
+   IF(DEFINED "ENV{ProgramFiles}")
+     LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles}")
+   ENDIF()
+   IF(DEFINED "ENV{ProgramFiles(x86)}")
+     # 64-bit binary.  32-bit program files are in ProgramFiles(x86).
+     LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{ProgramFiles(x86)}")
+   ELSEIF(DEFINED "ENV{SystemDrive}")
+     # Guess the 32-bit program files location.
+     IF(EXISTS "$ENV{SystemDrive}/Program Files (x86)")
+       LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+         "$ENV{SystemDrive}/Program Files (x86)")
+     ENDIF()
+   ENDIF()
+ ENDIF()
+ 
+ # Add the CMake install location.
  GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
  GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}")
  
! # Add other locations.
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Project install destination.
    "${CMAKE_INSTALL_PREFIX}"

Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.4
diff -C 2 -d -r1.45.2.3 -r1.45.2.4
*** Darwin.cmake	3 Sep 2008 13:43:16 -0000	1.45.2.3
--- Darwin.cmake	31 Dec 2008 15:14:29 -0000	1.45.2.4
***************
*** 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