Hi,
I enclosed patch for removing placeholder "x" from STREQUAL operands.
It does comparision transparent.
Regards
Jiri
>From e2a1f5490002c3479a1e637ae584d7c23a08561d Mon Sep 17 00:00:00 2001
From: Jiri Malak <[email protected]>
Date: Sun, 13 Apr 2014 06:55:17 +0200
Subject: [PATCH] remove "x" placeholder from STREQUAL operands
---
CMakeLists.txt | 2 +-
Modules/CMakeCommonLanguageInclude.cmake | 2 +-
Modules/CMakeParseImplicitLinkInfo.cmake | 4 ++--
Modules/CheckStructHasMember.cmake | 2 +-
Modules/CheckTypeSize.cmake | 6 +++---
Modules/ExternalProject.cmake | 4 ++--
Modules/FindBoost.cmake | 4 ++--
Modules/FindThreads.cmake | 2 +-
Modules/Platform/CYGWIN.cmake | 2 +-
Modules/Platform/Darwin.cmake | 2 +-
Modules/Qt4Macros.cmake | 6 +++---
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0793d0..c763121 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,7 +455,7 @@ endif()
# to a cdash4simpletest database. In these cases, the CDash dashboards
# should be run first.
#
-if("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
+if("${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "")
set(CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash";)
endif()
diff --git a/Modules/CMakeCommonLanguageInclude.cmake
b/Modules/CMakeCommonLanguageInclude.cmake
index fa025a8..e6762eb 100644
--- a/Modules/CMakeCommonLanguageInclude.cmake
+++ b/Modules/CMakeCommonLanguageInclude.cmake
@@ -16,7 +16,7 @@
# cache values that can be initialized in the platform-compiler.cmake file
# it may be included by more than one language.
-if(NOT "x$ENV{LDFLAGS}" STREQUAL "x")
+if(NOT "$ENV{LDFLAGS}" STREQUAL "")
set (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}
$ENV{LDFLAGS}")
set (CMAKE_SHARED_LINKER_FLAGS_INIT "${CMAKE_SHARED_LINKER_FLAGS_INIT}
$ENV{LDFLAGS}")
set (CMAKE_MODULE_LINKER_FLAGS_INIT "${CMAKE_MODULE_LINKER_FLAGS_INIT}
$ENV{LDFLAGS}")
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake
b/Modules/CMakeParseImplicitLinkInfo.cmake
index 4724a8c..5d116c6 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -43,7 +43,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var
fwk_var log_var obj
# on older versions it is not reported with proper quotes. Remove it.
string(REGEX REPLACE "([][+.*()^])" "\\\\\\1" _dir_regex
"${CMAKE_BINARY_DIR}")
string(REGEX REPLACE " -[FL]${_dir_regex}/([^ ]| [^-])+( |$)" " "
xline "${line}")
- if(NOT "x${xline}" STREQUAL "x${line}")
+ if(NOT "${xline}" STREQUAL "${line}")
set(log "${log} reduced line: [${line}]\n to:
[${xline}]\n")
set(line "${xline}")
endif()
@@ -129,7 +129,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var
dir_var fwk_var log_var obj
set(log "${log} remove lib [${lib}]\n")
elseif(IS_ABSOLUTE "${lib}")
get_filename_component(abs "${lib}" ABSOLUTE)
- if(NOT "x${lib}" STREQUAL "x${abs}")
+ if(NOT "${lib}" STREQUAL "${abs}")
set(log "${log} collapse lib [${lib}] ==> [${abs}]\n")
endif()
list(APPEND implicit_libs "${abs}")
diff --git a/Modules/CheckStructHasMember.cmake
b/Modules/CheckStructHasMember.cmake
index 880a688..95c8dfb 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -57,7 +57,7 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER
_RESULT)
set(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
endforeach ()
- if("x${ARGN}" STREQUAL "x")
+ if("${ARGN}" STREQUAL "")
set(_lang C)
elseif("x${ARGN}" MATCHES "^xLANGUAGE;([a-zA-Z]+)$")
set(_lang "${CMAKE_MATCH_1}")
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index d4651b9..d881f85 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -196,13 +196,13 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
# parse arguments
unset(doing)
foreach(arg ${ARGN})
- if("x${arg}" STREQUAL "xBUILTIN_TYPES_ONLY")
+ if("${arg}" STREQUAL "BUILTIN_TYPES_ONLY")
set(_CHECK_TYPE_SIZE_${arg} 1)
unset(doing)
- elseif("x${arg}" STREQUAL "xLANGUAGE") # change to MATCHES for more keys
+ elseif("${arg}" STREQUAL "LANGUAGE") # change to MATCHES for more keys
set(doing "${arg}")
set(_CHECK_TYPE_SIZE_${doing} "")
- elseif("x${doing}" STREQUAL "xLANGUAGE")
+ elseif("${doing}" STREQUAL "LANGUAGE")
set(_CHECK_TYPE_SIZE_${doing} "${arg}")
unset(doing)
else()
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 3ba91de..944e74e 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1101,7 +1101,7 @@ endif()
set(cmd "")
set(sep "")
foreach(arg IN LISTS command)
- if("x${arg}" STREQUAL "xCOMMAND")
+ if("${arg}" STREQUAL "COMMAND")
set(code "${code}set(command \"${cmd}\")${code_execute_process}")
set(cmd "")
set(sep "")
@@ -1536,7 +1536,7 @@ function(_ep_add_download_command name)
else()
if("${url}" MATCHES "^[a-z]+://")
# TODO: Should download and extraction be different steps?
- if("x${fname}" STREQUAL "x")
+ if("${fname}" STREQUAL "")
string(REGEX MATCH "[^/\\?]*$" fname "${url}")
endif()
if(NOT "${fname}" MATCHES "(\\.|=)(bz2|tar|tgz|tar\\.gz|zip)$")
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index d4026af..d7ec93e 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1198,8 +1198,8 @@ foreach(v BOOSTROOT BOOST_ROOT ${_Boost_VARS_INC}
${_Boost_VARS_LIB})
get_property(_type CACHE ${v} PROPERTY TYPE)
if(_type)
set_property(CACHE ${v} PROPERTY ADVANCED 1)
- if("x${_type}" STREQUAL "xUNINITIALIZED")
- if("x${v}" STREQUAL "xBoost_ADDITIONAL_VERSIONS")
+ if("${_type}" STREQUAL "UNINITIALIZED")
+ if("${v}" STREQUAL "Boost_ADDITIONAL_VERSIONS")
set_property(CACHE ${v} PROPERTY TYPE STRING)
else()
set_property(CACHE ${v} PROPERTY TYPE PATH)
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index 6d1c65d..6d2d85c 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -97,7 +97,7 @@ else()
if(NOT CMAKE_HAVE_THREADS_LIBRARY)
# If we did not found -lpthread, -lpthread, or -lthread, look for
-pthread
- if("x${THREADS_HAVE_PTHREAD_ARG}" STREQUAL "x")
+ if("${THREADS_HAVE_PTHREAD_ARG}" STREQUAL "")
message(STATUS "Check if compiler accepts -pthread")
try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
${CMAKE_BINARY_DIR}
diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake
index 22816e7..72b7457 100644
--- a/Modules/Platform/CYGWIN.cmake
+++ b/Modules/Platform/CYGWIN.cmake
@@ -11,7 +11,7 @@ if(NOT DEFINED WIN32)
if(CMAKE_LEGACY_CYGWIN_WIN32)
message(STATUS "Defining WIN32 under Cygwin due to
CMAKE_LEGACY_CYGWIN_WIN32")
set(WIN32 1)
- elseif("x${CMAKE_LEGACY_CYGWIN_WIN32}" STREQUAL "x")
+ elseif("${CMAKE_LEGACY_CYGWIN_WIN32}" STREQUAL "")
message(WARNING "CMake no longer defines WIN32 on Cygwin!"
"\n"
"(1) If you are just trying to build this project, ignore this warning
"
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index fc3f87e..dfd27ee 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -107,7 +107,7 @@ endif()
if(CMAKE_OSX_SYSROOT)
# Use the existing value without further computation to choose a default.
set(_CMAKE_OSX_SYSROOT_DEFAULT "${CMAKE_OSX_SYSROOT}")
-elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
+elseif(NOT "$ENV{SDKROOT}" STREQUAL "" AND
(NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}"))
# Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 23c4fc0..0fc2bd7 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -33,9 +33,9 @@ macro (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options
_qt4_target)
set(_QT4_DOING_OPTIONS FALSE)
set(_QT4_DOING_TARGET FALSE)
foreach(_currentArg ${ARGN})
- if ("x${_currentArg}" STREQUAL "xOPTIONS")
+ if ("${_currentArg}" STREQUAL "OPTIONS")
set(_QT4_DOING_OPTIONS TRUE)
- elseif ("x${_currentArg}" STREQUAL "xTARGET")
+ elseif ("${_currentArg}" STREQUAL "TARGET")
set(_QT4_DOING_TARGET TRUE)
else ()
if(_QT4_DOING_TARGET)
@@ -156,7 +156,7 @@ macro (QT4_GENERATE_MOC infile outfile )
set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
endif()
- if ("x${ARGV2}" STREQUAL "xTARGET")
+ if ("${ARGV2}" STREQUAL "TARGET")
set(moc_target ${ARGV3})
endif()
QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" ""
"${moc_target}")
--
1.8.1.msysgit.1
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
