diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-08 12:46:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-08 12:48:20 (GMT) |
| commit | a1c402910c2010c0ec91d6325b4119ce0fe8379b (patch) | |
| tree | 6cbecc5c01d769ef73b47d717dca88c42e212e70 | |
| parent | c79f88b0197eeb927100769ef5c4cef0275acf3a (diff) | |
| download | CMake-a1c402910c2010c0ec91d6325b4119ce0fe8379b.zip CMake-a1c402910c2010c0ec91d6325b4119ce0fe8379b.tar.gz CMake-a1c402910c2010c0ec91d6325b4119ce0fe8379b.tar.bz2 | |
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.
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
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" |