[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2353-g161ec93
Brad King
brad.king at kitware.com
Thu Feb 28 10:51:41 EST 2013
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 161ec93241ec565fc68e03e78059562826b06545 (commit)
via 33c94c82ba7d525e3435248c98132d87415e95a3 (commit)
via 5260a864f5571eeb5697fb2e3b2dda0407de0a7b (commit)
via 2929768541d8ad9d7cfb2a46da676b2dcbb216a4 (commit)
from d10c2caa7c63c4e0de98e4072f58b30fa4969219 (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=161ec93241ec565fc68e03e78059562826b06545
commit 161ec93241ec565fc68e03e78059562826b06545
Merge: d10c2ca 33c94c8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 10:51:38 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 28 10:51:38 2013 -0500
Merge topic 'GetPrerequisites-objdump' into next
33c94c8 GetPrerequisites: Add support for objdump
5260a86 GetPrerequisites: Move tool search paths up
2929768 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33c94c82ba7d525e3435248c98132d87415e95a3
commit 33c94c82ba7d525e3435248c98132d87415e95a3
Author: Michael Tänzer <neo at nhng.de>
AuthorDate: Thu Feb 28 15:28:30 2013 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 28 09:49:32 2013 -0500
GetPrerequisites: Add support for objdump
Make it usable on MinGW without Visual Studio installed.
Signed-off-by: Michael Tänzer <neo at nhng.de>
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index c37417c..3bd3fdf 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -585,11 +585,18 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
#
if("${gp_tool}" STREQUAL "")
set(gp_tool "ldd")
+
if(APPLE)
set(gp_tool "otool")
endif()
+
if(WIN32 AND NOT UNIX) # This is how to check for cygwin, har!
- set(gp_tool "dumpbin")
+ find_program(gp_dumpbin "dumpbin" PATHS ${gp_cmd_paths})
+ if(gp_dumpbin)
+ set(gp_tool "dumpbin")
+ else() # Try harder. Maybe we're on MinGW
+ set(gp_tool "objdump")
+ endif()
endif()
endif()
@@ -630,10 +637,19 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(ENV{VS_UNICODE_OUTPUT} "") # Block extra output from inside VS IDE.
endif()
+ if("${gp_tool}" STREQUAL "objdump")
+ set(gp_cmd_args "-p")
+ set(gp_regex "^\t*DLL Name: (.*\\.[Dd][Ll][Ll])${eol_char}$")
+ set(gp_regex_error "")
+ set(gp_regex_fallback "")
+ set(gp_regex_cmp_count 1)
+ set(gp_tool_known 1)
+ endif()
+
if(NOT gp_tool_known)
message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")
message(STATUS "CMake function get_prerequisites needs more code to handle '${gp_tool}'")
- message(STATUS "Valid gp_tool values are dumpbin, ldd and otool.")
+ message(STATUS "Valid gp_tool values are dumpbin, ldd, objdump and otool.")
return()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5260a864f5571eeb5697fb2e3b2dda0407de0a7b
commit 5260a864f5571eeb5697fb2e3b2dda0407de0a7b
Author: Michael Tänzer <neo at nhng.de>
AuthorDate: Thu Feb 28 15:26:34 2013 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 28 09:48:11 2013 -0500
GetPrerequisites: Move tool search paths up
Make them usable in the gp_tool selection heuristic.
Signed-off-by: Michael Tänzer <neo at nhng.de>
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 8f2754e..c37417c 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -567,6 +567,17 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
message("warning: target '${target}' does not exist...")
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>
#
# 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()
+ 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)
if("${gp_tool}" STREQUAL "ldd")
@@ -619,23 +637,6 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
return()
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")
# When running dumpbin, it also needs the "Common7/IDE" directory in the
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 55 ++++++++++++++++++++++++++--------------
Source/CMakeVersion.cmake | 2 +-
2 files changed, 37 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list