[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-717-g9147af1
Rolf Eike Beer
eike at sf-mail.de
Tue Nov 18 12:45:16 EST 2014
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 9147af1821cb5017db1230e2eda38ffc42ccdd83 (commit)
via ec36e1c2afe7c8258588dd51a9fe75b7fb523206 (commit)
from ef164864bcc990f1c1bbc1ff69e4b8021b0586a7 (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=9147af1821cb5017db1230e2eda38ffc42ccdd83
commit 9147af1821cb5017db1230e2eda38ffc42ccdd83
Merge: ef16486 ec36e1c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Nov 18 12:45:16 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 18 12:45:16 2014 -0500
Merge topic 'GetPrerequisites-expansion' into next
ec36e1c2 GetPrerequisites: remove needless variable dereferencing
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec36e1c2afe7c8258588dd51a9fe75b7fb523206
commit ec36e1c2afe7c8258588dd51a9fe75b7fb523206
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Nov 18 18:43:27 2014 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Nov 18 18:43:27 2014 +0100
GetPrerequisites: remove needless variable dereferencing
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 9963517..fa84df4 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -179,7 +179,7 @@ function(gp_append_unique list_var value)
set(contains 0)
foreach(item ${${list_var}})
- if("${item}" STREQUAL "${value}")
+ if(item STREQUAL "${value}")
set(contains 1)
break()
endif()
@@ -546,14 +546,14 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
if(NOT is_system)
get_filename_component(original_path "${original_lower}" PATH)
get_filename_component(path "${lower}" PATH)
- if("${original_path}" STREQUAL "${path}")
+ if(original_path STREQUAL path)
set(is_local 1)
else()
string(LENGTH "${original_path}/" original_length)
string(LENGTH "${lower}" path_length)
if(${path_length} GREATER ${original_length})
string(SUBSTRING "${lower}" 0 ${original_length} path)
- if("${original_path}/" STREQUAL "${path}")
+ if("${original_path}/" STREQUAL path)
set(is_embedded 1)
endif()
endif()
@@ -642,7 +642,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
# Try to choose the right tool by default. Caller can set gp_tool prior to
# calling this function to force using a different tool.
#
- if("${gp_tool}" STREQUAL "")
+ if(NOT gp_tool)
set(gp_tool "ldd")
if(APPLE)
@@ -668,7 +668,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_tool_known 0)
- if("${gp_tool}" STREQUAL "ldd")
+ if(gp_tool STREQUAL "ldd")
set(gp_cmd_args "")
set(gp_regex "^[\t ]*[^\t ]+ => ([^\t\(]+) .*${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
@@ -677,7 +677,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_tool_known 1)
endif()
- if("${gp_tool}" STREQUAL "otool")
+ if(gp_tool STREQUAL "otool")
set(gp_cmd_args "-L")
set(gp_regex "^\t([^\t]+) \\(compatibility version ([0-9]+.[0-9]+.[0-9]+), current version ([0-9]+.[0-9]+.[0-9]+)\\)${eol_char}$")
set(gp_regex_error "")
@@ -686,7 +686,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_tool_known 1)
endif()
- if("${gp_tool}" STREQUAL "dumpbin")
+ if(gp_tool STREQUAL "dumpbin")
set(gp_cmd_args "/dependents")
set(gp_regex "^ ([^ ].*[Dd][Ll][Ll])${eol_char}$")
set(gp_regex_error "")
@@ -695,7 +695,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_tool_known 1)
endif()
- if("${gp_tool}" STREQUAL "objdump")
+ 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 "")
@@ -712,7 +712,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
endif()
- if("${gp_tool}" STREQUAL "dumpbin")
+ if(gp_tool STREQUAL "dumpbin")
# When running dumpbin, it also needs the "Common7/IDE" directory in the
# PATH. It will already be in the PATH if being run from a Visual Studio
# command prompt. Add it to the PATH here in case we are running from a
@@ -727,7 +727,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_found_cmd_dlls_dir 0)
file(TO_CMAKE_PATH "$ENV{PATH}" env_path)
foreach(gp_env_path_element ${env_path})
- if("${gp_env_path_element}" STREQUAL "${gp_cmd_dlls_dir}")
+ if(gp_env_path_element STREQUAL gp_cmd_dlls_dir)
set(gp_found_cmd_dlls_dir 1)
endif()
endforeach()
@@ -741,7 +741,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
#
# </setup-gp_tool-vars>
- if("${gp_tool}" STREQUAL "ldd")
+ if(gp_tool STREQUAL "ldd")
set(old_ld_env "$ENV{LD_LIBRARY_PATH}")
set(new_ld_env "${exepath}")
foreach(dir ${dirs})
@@ -763,7 +763,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
OUTPUT_VARIABLE gp_cmd_ov
)
- if("${gp_tool}" STREQUAL "ldd")
+ if(gp_tool STREQUAL "ldd")
set(ENV{LD_LIBRARY_PATH} "${old_ld_env}")
endif()
@@ -783,7 +783,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
# check for install id and remove it from list, since otool -L can include a
# reference to itself
set(gp_install_id)
- if("${gp_tool}" STREQUAL "otool")
+ if(gp_tool STREQUAL "otool")
execute_process(
COMMAND otool -D ${target}
OUTPUT_VARIABLE gp_install_id_ov
@@ -833,7 +833,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
#
set(add_item 1)
- if("${item}" STREQUAL "${gp_install_id}")
+ if(item STREQUAL gp_install_id)
set(add_item 0)
endif()
@@ -841,7 +841,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(type "")
gp_resolved_file_type("${target}" "${item}" "${exepath}" "${dirs}" type "${rpaths}")
- if("${type}" STREQUAL "system")
+ if(type STREQUAL "system")
set(add_item 0)
endif()
endif()
@@ -888,19 +888,19 @@ endfunction()
function(list_prerequisites target)
- if("${ARGV1}" STREQUAL "")
+ if(NOT ARGV1)
set(all 1)
else()
set(all "${ARGV1}")
endif()
- if("${ARGV2}" STREQUAL "")
+ if(NOT ARGV2)
set(exclude_system 0)
else()
set(exclude_system "${ARGV2}")
endif()
- if("${ARGV3}" STREQUAL "")
+ if(NOT ARGV3)
set(verbose 0)
else()
set(verbose "${ARGV3}")
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list