[Cmake-commits] [cmake-commits] david.cole committed CMakeVS8FindMake.cmake 1.8 1.9 CMakeVS9FindMake.cmake 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeVS8FindMake.cmake CMakeVS9FindMake.cmake 
Log Message:
BUG: Rearrange paths to find correct installations of Visual Studio. Patch devenv.modified_search_order.patch came from issue #7919.


Index: CMakeVS8FindMake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVS8FindMake.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CMakeVS8FindMake.cmake	9 May 2009 12:15:51 -0000	1.8
--- CMakeVS8FindMake.cmake	26 May 2009 13:55:09 -0000	1.9
***************
*** 8,21 ****
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
    NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
!   PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]
-   "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio 8/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio8/Common7/IDE"
-   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio .NET/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 8/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio8/Common7/IDE"
    "/Program Files/Microsoft Visual Studio 8/Common7/IDE/"
    )
  MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
--- 8,22 ----
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
    NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
!   HINTS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]
    "$ENV{ProgramFiles}/Microsoft Visual Studio 8/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio8/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 8/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio8/Common7/IDE"
    "/Program Files/Microsoft Visual Studio 8/Common7/IDE/"
+   PATHS
+   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio .NET/Common7/IDE"
+   "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
    )
  MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)

Index: CMakeVS9FindMake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVS9FindMake.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeVS9FindMake.cmake	9 May 2009 12:15:53 -0000	1.2
--- CMakeVS9FindMake.cmake	26 May 2009 13:55:10 -0000	1.3
***************
*** 8,21 ****
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
    NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
!   PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup;Dbghelp_path]
!   "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio 9/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio9/Common7/IDE"
!   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio .NET/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 9/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio9/Common7/IDE"
    "/Program Files/Microsoft Visual Studio 9/Common7/IDE/"
    )
  MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)
--- 8,28 ----
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
    NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
!   HINTS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup;Dbghelp_path]
!   "$ENV{ProgramFiles}/Microsoft Visual Studio 9.0/Common7/IDE"
!   "$ENV{ProgramFiles}/Microsoft Visual Studio9.0/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio 9/Common7/IDE"
    "$ENV{ProgramFiles}/Microsoft Visual Studio9/Common7/IDE"
!   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 9.0/Common7/IDE"
!   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio9.0/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 9/Common7/IDE"
    "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio9/Common7/IDE"
+   "/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/"
    "/Program Files/Microsoft Visual Studio 9/Common7/IDE/"
+   PATHS
+   "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio .NET/Common7/IDE"
+   "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE"
+   
    )
  MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM)