kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GetPrerequisites: Move tool search paths up 

Make them usable in the gp_tool selection heuristic.

Signed-off-by: Michael Tänzer <neo@nhng.de>
This commit is contained in:
Michael Tänzer 2013-02-28 15:26:34 +01:00 committed by Brad King
parent 2929768541
commit 5260a864f5
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Modules/GetPrerequisites.cmake
View File

@ -567,6 +567,17 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
message("warning: target '${target}' does not exist...") message("warning: target '${target}' does not exist...")
endif() endif()
set(gp_cmd_paths ${gp_cmd_paths}
"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"
"C:/Program Files (x86)/Microsoft Visual Studio 8/VC/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"
"/usr/bin"
)
# <setup-gp_tool-vars> # <setup-gp_tool-vars>
# #
# Try to choose the right tool by default. Caller can set gp_tool prior to # Try to choose the right tool by default. Caller can set gp_tool prior to
@ -582,6 +593,13 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
endif() endif()
endif() endif()
find_program(gp_cmd ${gp_tool} PATHS ${gp_cmd_paths})
if(NOT gp_cmd)
message(STATUS "warning: could not find '${gp_tool}' - cannot analyze prerequisites...")
return()
endif()
set(gp_tool_known 0) set(gp_tool_known 0)
if("${gp_tool}" STREQUAL "ldd") if("${gp_tool}" STREQUAL "ldd")
@ -619,23 +637,6 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
return() return()
endif() endif()
set(gp_cmd_paths ${gp_cmd_paths}
"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"
"C:/Program Files (x86)/Microsoft Visual Studio 8/VC/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"
"/usr/bin"
)
find_program(gp_cmd ${gp_tool} PATHS ${gp_cmd_paths})
if(NOT gp_cmd)
message(STATUS "warning: could not find '${gp_tool}' - cannot analyze prerequisites...")
return()
endif()
if("${gp_tool}" STREQUAL "dumpbin") if("${gp_tool}" STREQUAL "dumpbin")
# When running dumpbin, it also needs the "Common7/IDE" directory in the # When running dumpbin, it also needs the "Common7/IDE" directory in the