Remove trailing white-spaces.
This commit is contained in:
parent
aff0029ee3
commit
3ba74ad9d5
|
@ -129,7 +129,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
|
|||
std::string targetFullPathReal = outpath + targetNameReal;
|
||||
std::string targetFullPathPDB = outpath + targetNamePDB;
|
||||
std::string targetFullPathImport = outpathImp + targetNameImport;
|
||||
std::string targetOutPathPDB =
|
||||
std::string targetOutPathPDB =
|
||||
this->Convert(targetFullPathPDB.c_str(),
|
||||
cmLocalGenerator::NONE,
|
||||
cmLocalGenerator::SHELL);
|
||||
|
|
|
@ -22,7 +22,7 @@ public:
|
|||
/* the main entry point for this class. Writes the Makefiles associated
|
||||
with this target */
|
||||
virtual void WriteRuleFiles();
|
||||
|
||||
|
||||
protected:
|
||||
virtual void WriteExecutableRule(bool relink);
|
||||
void CreateAppBundle(std::string& targetName, std::string& outpath);
|
||||
|
|
|
@ -199,7 +199,7 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
|
|||
linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
|
||||
this->LocalGenerator->AppendFlags
|
||||
(extraFlags, this->Target->GetProperty(linkFlagsConfig.c_str()));
|
||||
|
||||
|
||||
this->LocalGenerator->AddConfigVariableFlags
|
||||
(extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
|
||||
this->AddModuleDefinitionFlag(extraFlags);
|
||||
|
@ -220,7 +220,7 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
|
|||
linkRuleVar += "_CREATE_SHARED_MODULE";
|
||||
|
||||
std::string extraFlags;
|
||||
this->LocalGenerator->AppendFlags(extraFlags,
|
||||
this->LocalGenerator->AppendFlags(extraFlags,
|
||||
this->Target->GetProperty("LINK_FLAGS"));
|
||||
std::string linkFlagsConfig = "LINK_FLAGS_";
|
||||
linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
|
||||
|
@ -246,7 +246,7 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
|
|||
linkRuleVar += "_CREATE_MACOSX_FRAMEWORK";
|
||||
|
||||
std::string extraFlags;
|
||||
this->LocalGenerator->AppendFlags(extraFlags,
|
||||
this->LocalGenerator->AppendFlags(extraFlags,
|
||||
this->Target->GetProperty("LINK_FLAGS"));
|
||||
std::string linkFlagsConfig = "LINK_FLAGS_";
|
||||
linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
|
||||
|
@ -460,16 +460,16 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
|
|||
|
||||
// Construct the output path version of the names for use in command
|
||||
// arguments.
|
||||
std::string targetOutPathPDB =
|
||||
std::string targetOutPathPDB =
|
||||
this->Convert(targetFullPathPDB.c_str(),cmLocalGenerator::NONE,
|
||||
cmLocalGenerator::SHELL);
|
||||
std::string targetOutPath =
|
||||
std::string targetOutPath =
|
||||
this->Convert(targetFullPath.c_str(),cmLocalGenerator::START_OUTPUT,
|
||||
cmLocalGenerator::SHELL);
|
||||
std::string targetOutPathSO =
|
||||
std::string targetOutPathSO =
|
||||
this->Convert(targetFullPathSO.c_str(),cmLocalGenerator::START_OUTPUT,
|
||||
cmLocalGenerator::SHELL);
|
||||
std::string targetOutPathReal =
|
||||
std::string targetOutPathReal =
|
||||
this->Convert(targetFullPathReal.c_str(),cmLocalGenerator::START_OUTPUT,
|
||||
cmLocalGenerator::SHELL);
|
||||
std::string targetOutPathImport =
|
||||
|
@ -569,7 +569,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
|
|||
|
||||
std::vector<std::string> commands1;
|
||||
// Add a command to remove any existing files for this library.
|
||||
// for static libs only
|
||||
// for static libs only
|
||||
if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
|
||||
{
|
||||
this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "cmMakefileTargetGenerator.h"
|
||||
|
||||
class cmMakefileLibraryTargetGenerator:
|
||||
class cmMakefileLibraryTargetGenerator:
|
||||
public cmMakefileTargetGenerator
|
||||
{
|
||||
public:
|
||||
|
@ -22,8 +22,8 @@ public:
|
|||
|
||||
/* the main entry point for this class. Writes the Makefiles associated
|
||||
with this target */
|
||||
virtual void WriteRuleFiles();
|
||||
|
||||
virtual void WriteRuleFiles();
|
||||
|
||||
protected:
|
||||
void WriteObjectLibraryRules();
|
||||
void WriteStaticLibraryRules();
|
||||
|
|
16
bootstrap
16
bootstrap
|
@ -72,14 +72,14 @@ else
|
|||
cmake_system_darwin=false
|
||||
fi
|
||||
|
||||
# Determine whether this is BeOS
|
||||
# Determine whether this is BeOS
|
||||
if echo "${cmake_system}" | grep BeOS >/dev/null 2>&1; then
|
||||
cmake_system_beos=true
|
||||
else
|
||||
cmake_system_beos=false
|
||||
fi
|
||||
|
||||
# Determine whether this is Haiku
|
||||
# Determine whether this is Haiku
|
||||
if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
|
||||
cmake_system_haiku=true
|
||||
else
|
||||
|
@ -351,7 +351,7 @@ cmake_error()
|
|||
res=$1
|
||||
shift 1
|
||||
echo "---------------------------------------------"
|
||||
echo "Error when bootstrapping CMake:"
|
||||
echo "Error when bootstrapping CMake:"
|
||||
echo "$*"
|
||||
echo "---------------------------------------------"
|
||||
if [ -f cmake_bootstrap.log ]; then
|
||||
|
@ -370,7 +370,7 @@ cmake_replace_string ()
|
|||
SEARCHFOR="$3"
|
||||
REPLACEWITH="$4"
|
||||
if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
|
||||
cat "${INFILE}" |
|
||||
cat "${INFILE}" |
|
||||
sed "s/\@${SEARCHFOR}\@/${REPLACEWITH}/g" > "${OUTFILE}${_tmp}"
|
||||
if [ -f "${OUTFILE}${_tmp}" ]; then
|
||||
if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
|
||||
|
@ -393,7 +393,7 @@ cmake_kwsys_config_replace_string ()
|
|||
APPEND="$*"
|
||||
if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
|
||||
echo "${APPEND}" > "${OUTFILE}${_tmp}"
|
||||
cat "${INFILE}" |
|
||||
cat "${INFILE}" |
|
||||
sed "/./ {s/\@KWSYS_NAMESPACE\@/cmsys/g;
|
||||
s/@KWSYS_BUILD_SHARED@/${KWSYS_BUILD_SHARED}/g;
|
||||
s/@KWSYS_LFS_AVAILABLE@/${KWSYS_LFS_AVAILABLE}/g;
|
||||
|
@ -797,7 +797,7 @@ echo '
|
|||
# include <iostream.h>
|
||||
#endif
|
||||
|
||||
class NeedCXX
|
||||
class NeedCXX
|
||||
{
|
||||
public:
|
||||
NeedCXX() { this->Foo = 1; }
|
||||
|
@ -1387,12 +1387,12 @@ cmake_kwsys_config_replace_string \
|
|||
"${cmake_bootstrap_dir}/cmsys/Configure.h" \
|
||||
"${cmake_compiler_settings_comment}"
|
||||
|
||||
for a in ${KWSYS_FILES}; do
|
||||
for a in ${KWSYS_FILES}; do
|
||||
cmake_replace_string "${cmake_source_dir}/Source/kwsys/${a}.in" \
|
||||
"${cmake_bootstrap_dir}/cmsys/${a}" KWSYS_NAMESPACE cmsys
|
||||
done
|
||||
|
||||
for a in ${KWSYS_IOS_FILES}; do
|
||||
for a in ${KWSYS_IOS_FILES}; do
|
||||
cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_ios_${a}.h.in" \
|
||||
"${cmake_bootstrap_dir}/cmsys/ios/${a}" KWSYS_NAMESPACE cmsys
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue