[Cmake-commits] CMake branch, next, updated. v3.5.1-869-g4a2613a
Brad King
brad.king at kitware.com
Fri Apr 8 08:48:30 EDT 2016
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 4a2613a52302d6c09d557af2d97d0c513307d84a (commit)
via a1c402910c2010c0ec91d6325b4119ce0fe8379b (commit)
via c79f88b0197eeb927100769ef5c4cef0275acf3a (commit)
via 2f76effd0a8fd7bb25941891ca9603d27f1c571f (commit)
from 8554832559700c8cda4ed2bdedfcd157addf9a94 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a2613a52302d6c09d557af2d97d0c513307d84a
commit 4a2613a52302d6c09d557af2d97d0c513307d84a
Merge: 8554832 a1c4029
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 08:48:30 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 08:48:30 2016 -0400
Merge topic 'GetPrerequisites-more-dumpbin-paths' into next
a1c40291 GetPrerequisites: Look for VS tools using environment variables
c79f88b0 GetPrerequisites: add path of VS 10,11,12,14 in order to find dumpbin.exe
2f76effd CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1c402910c2010c0ec91d6325b4119ce0fe8379b
commit a1c402910c2010c0ec91d6325b4119ce0fe8379b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 08:46:31 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 08:48:20 2016 -0400
GetPrerequisites: Look for VS tools using environment variables
The `VS*COMNTOOLS` environment variables specify locations of VS tools
and are set during the VS installation. Use them in addition to the
hard-coded default install locations.
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index f32e289..dd294f4 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -663,14 +663,21 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
endif()
set(gp_cmd_paths ${gp_cmd_paths}
+ "$ENV{VS140COMNTOOLS}/../../VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+ "$ENV{VS120COMNTOOLS}/../../VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+ "$ENV{VS110COMNTOOLS}/../../VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+ "$ENV{VS100COMNTOOLS}/../../VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+ "$ENV{VS90COMNTOOLS}/../../VC/bin"
"C:/Program Files/Microsoft Visual Studio 9.0/VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+ "$ENV{VS80COMNTOOLS}/../../VC/bin"
"C:/Program Files/Microsoft Visual Studio 8/VC/BIN"
"C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
+ "$ENV{VS71COMNTOOLS}/../../VC7/bin"
"C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
"C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
"/usr/local/bin"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c79f88b0197eeb927100769ef5c4cef0275acf3a
commit c79f88b0197eeb927100769ef5c4cef0275acf3a
Author: FARBOS Arnaud <farbos.arnaud at gmail.com>
AuthorDate: Fri Apr 8 10:00:55 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 08:48:03 2016 -0400
GetPrerequisites: add path of VS 10,11,12,14 in order to find dumpbin.exe
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 9ea1281..f32e289 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -663,6 +663,10 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
endif()
set(gp_cmd_paths ${gp_cmd_paths}
+ "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+ "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+ "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+ "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
"C:/Program Files/Microsoft Visual Studio 9.0/VC/bin"
"C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
"C:/Program Files/Microsoft Visual Studio 8/VC/BIN"
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 11 +++++++++++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list