[Cmake-commits] CMake branch, next, updated. v2.8.1-1432-ge97fb72

David Cole david.cole at kitware.com
Wed Jun 16 12:17:49 EDT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e97fb728383556c1b574efffeff1d81a3e9fa8ae (commit)
       via  682b4fdcafce5e6b999a1089d916966517785dc3 (commit)
       via  2da22e7f5c85d7e4260bd0c38619ada5be8d7932 (commit)
      from  8ecadb1987acae8be91fb220253edc287d70167f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e97fb728383556c1b574efffeff1d81a3e9fa8ae
commit e97fb728383556c1b574efffeff1d81a3e9fa8ae
Merge: 8ecadb1 682b4fd
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 16 12:17:41 2010 -0400

    Merge branch 'remove-bad-paths-from-CMakeVSFind-modules' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=682b4fdcafce5e6b999a1089d916966517785dc3
commit 682b4fdcafce5e6b999a1089d916966517785dc3
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 16 12:14:18 2010 -0400

    Remove "Microsoft Visual Studio .NET" from VS8 and VS9 find modules.
    
    CMake was incorrectly finding devenv from Visual Studio 7.1 installations
    when asked to generate using Visual Studio 9 2008. Now, it will not.

diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake
index 6f45ed5..2f03e60 100644
--- a/Modules/CMakeVS8FindMake.cmake
+++ b/Modules/CMakeVS8FindMake.cmake
@@ -28,9 +28,6 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "$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)
 SET(MSVC80 1)
diff --git a/Modules/CMakeVS9FindMake.cmake b/Modules/CMakeVS9FindMake.cmake
index 2741f77..4704bcc 100644
--- a/Modules/CMakeVS9FindMake.cmake
+++ b/Modules/CMakeVS9FindMake.cmake
@@ -33,10 +33,6 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM
   "$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)
 SET(MSVC90 1)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeVS8FindMake.cmake    |    3 ---
 Modules/CMakeVS9FindMake.cmake    |    4 ----
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 3 files changed, 1 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list