Fix spelling and typos (non-binary)
This commit is contained in:
parent
ddac8d3d2d
commit
bf019d765d
|
@ -34,7 +34,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
|
||||||
set(CPACK_NSIS_MODIFY_PATH ON)
|
set(CPACK_NSIS_MODIFY_PATH ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# include the cpack options for qt dialog if they exisit
|
# include the cpack options for qt dialog if they exist
|
||||||
# they might not if qt was not enabled for the build
|
# they might not if qt was not enabled for the build
|
||||||
include("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL)
|
include("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL)
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# NAME = name of the package
|
# NAME = name of the package
|
||||||
# COMPILER_ID = the CMake compiler ID for which the result is, i.e. GNU/Intel/Clang/MSVC, etc.
|
# COMPILER_ID = the CMake compiler ID for which the result is, i.e. GNU/Intel/Clang/MSVC, etc.
|
||||||
# LANGUAGE = language for which the result will be used, i.e. C/CXX/Fortan/ASM
|
# LANGUAGE = language for which the result will be used, i.e. C/CXX/Fortan/ASM
|
||||||
# MODE = EXIST : only check for existance of the given package
|
# MODE = EXIST : only check for existence of the given package
|
||||||
# COMPILE : print the flags needed for compiling an object file which uses the given package
|
# COMPILE : print the flags needed for compiling an object file which uses the given package
|
||||||
# LINK : print the flags needed for linking when using the given package
|
# LINK : print the flags needed for linking when using the given package
|
||||||
# QUIET = if TRUE, don't print anything
|
# QUIET = if TRUE, don't print anything
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
# MY_INSTALL_CONFIGURATIONS = "" (was not used)
|
# MY_INSTALL_CONFIGURATIONS = "" (was not used)
|
||||||
# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
|
# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
|
||||||
#
|
#
|
||||||
# You can the continue and process these variables.
|
# You can then continue and process these variables.
|
||||||
#
|
#
|
||||||
# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
|
# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
|
||||||
# another recognized keyword follows, this is interpreted as the beginning of
|
# another recognized keyword follows, this is interpreted as the beginning of
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
##end
|
##end
|
||||||
##module
|
##module
|
||||||
# - PackageMaker CPack generator (Mac OS X).
|
# - PackageMaker CPack generator (Mac OS X).
|
||||||
# The following variable is specific to installers build on Mac OS X
|
# The following variable is specific to installers built on Mac OS X
|
||||||
# using PackageMaker:
|
# using PackageMaker:
|
||||||
##end
|
##end
|
||||||
#
|
#
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# Check that the <function> is provided by libraries on the system and
|
# Check that the <function> is provided by libraries on the system and
|
||||||
# store the result in a <variable>. This does not verify that any
|
# store the result in a <variable>. This does not verify that any
|
||||||
# system header file declares the function, only that it can be found
|
# system header file declares the function, only that it can be found
|
||||||
# at link time (considure using CheckSymbolExists).
|
# at link time (consider using CheckSymbolExists).
|
||||||
#
|
#
|
||||||
# The following variables may be set before calling this macro to
|
# The following variables may be set before calling this macro to
|
||||||
# modify the way the check is run:
|
# modify the way the check is run:
|
||||||
|
|
|
@ -15,4 +15,4 @@
|
||||||
message(SEND_ERROR
|
message(SEND_ERROR
|
||||||
"Modules/CheckSizeOf.cmake has been removed. "
|
"Modules/CheckSizeOf.cmake has been removed. "
|
||||||
"Use Modules/CheckTypeSize.cmake instead. This "
|
"Use Modules/CheckTypeSize.cmake instead. This "
|
||||||
"compatability check may be removed before the next release!")
|
"compatibility check may be removed before the next release!")
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
# Boost_LIBRARY_DIR - Directory containing Boost libraries
|
# Boost_LIBRARY_DIR - Directory containing Boost libraries
|
||||||
# Boost_<C>_LIBRARY_DEBUG - Component <C> library debug variant
|
# Boost_<C>_LIBRARY_DEBUG - Component <C> library debug variant
|
||||||
# Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant
|
# Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant
|
||||||
# Users may set the these hints or results as cache entries. Projects should
|
# Users may set these hints or results as cache entries. Projects should
|
||||||
# not read these entries directly but instead use the above result variables.
|
# not read these entries directly but instead use the above result variables.
|
||||||
# Note that some hint names start in upper-case "BOOST". One may specify
|
# Note that some hint names start in upper-case "BOOST". One may specify
|
||||||
# these as environment variables if they are not specified as CMake variables
|
# these as environment variables if they are not specified as CMake variables
|
||||||
|
@ -154,7 +154,7 @@
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# Before we go searching, check whether boost-cmake is avaialble, unless the
|
# Before we go searching, check whether boost-cmake is available, unless the
|
||||||
# user specifically asked NOT to search for boost-cmake.
|
# user specifically asked NOT to search for boost-cmake.
|
||||||
#
|
#
|
||||||
# If Boost_DIR is set, this behaves as any find_package call would. If not,
|
# If Boost_DIR is set, this behaves as any find_package call would. If not,
|
||||||
|
@ -247,7 +247,7 @@ macro(_Boost_ADJUST_LIB_VARS basename)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
# Make variables changeble to the advanced user
|
# Make variables changeable to the advanced user
|
||||||
mark_as_advanced(
|
mark_as_advanced(
|
||||||
Boost_${basename}_LIBRARY_RELEASE
|
Boost_${basename}_LIBRARY_RELEASE
|
||||||
Boost_${basename}_LIBRARY_DEBUG
|
Boost_${basename}_LIBRARY_DEBUG
|
||||||
|
|
|
@ -45,7 +45,7 @@ if(APPLE)
|
||||||
set( FLTK2_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
set( FLTK2_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# If FLTK2_INCLUDE_DIR is already defined we assigne its value to FLTK2_DIR
|
# If FLTK2_INCLUDE_DIR is already defined we assign its value to FLTK2_DIR
|
||||||
if(FLTK2_INCLUDE_DIR)
|
if(FLTK2_INCLUDE_DIR)
|
||||||
set(FLTK2_DIR ${FLTK2_INCLUDE_DIR})
|
set(FLTK2_DIR ${FLTK2_INCLUDE_DIR})
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#
|
#
|
||||||
# USE_ITK_FILE - The full path to the UseITK.cmake file.
|
# USE_ITK_FILE - The full path to the UseITK.cmake file.
|
||||||
# This is provided for backward
|
# This is provided for backward
|
||||||
# compatability. Use ITK_USE_FILE
|
# compatibility. Use ITK_USE_FILE
|
||||||
# instead.
|
# instead.
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
@ -52,6 +52,6 @@ if(NOT ITK_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ITK_FOUND)
|
if(ITK_FOUND)
|
||||||
# Set USE_ITK_FILE for backward-compatability.
|
# Set USE_ITK_FILE for backward-compatibility.
|
||||||
set(USE_ITK_FILE ${ITK_USE_FILE})
|
set(USE_ITK_FILE ${ITK_USE_FILE})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -86,7 +86,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake)
|
||||||
#
|
#
|
||||||
# The compilers are detected in this order:
|
# The compilers are detected in this order:
|
||||||
#
|
#
|
||||||
# 1. Try to find the most generic availble MPI compiler, as this is usually set up by
|
# 1. Try to find the most generic available MPI compiler, as this is usually set up by
|
||||||
# cluster admins. e.g., if plain old mpicc is available, we'll use it and assume it's
|
# cluster admins. e.g., if plain old mpicc is available, we'll use it and assume it's
|
||||||
# the right compiler.
|
# the right compiler.
|
||||||
#
|
#
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
# You should have a look on the AUTOMOC property for targets to achieve the same results.
|
# You should have a look on the AUTOMOC property for targets to achieve the same results.
|
||||||
#
|
#
|
||||||
# macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
|
# macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
|
||||||
# Create a the interface header and implementation files with the
|
# Create the interface header and implementation files with the
|
||||||
# given basename from the given interface xml file and add it to
|
# given basename from the given interface xml file and add it to
|
||||||
# the list of sources.
|
# the list of sources.
|
||||||
#
|
#
|
||||||
|
@ -171,7 +171,7 @@
|
||||||
# in: ts_files
|
# in: ts_files
|
||||||
# generates commands to create .qm from .ts - files. The generated
|
# generates commands to create .qm from .ts - files. The generated
|
||||||
# filenames can be found in qm_files. The ts_files
|
# filenames can be found in qm_files. The ts_files
|
||||||
# must exists and are not updated in any way.
|
# must exist and are not updated in any way.
|
||||||
#
|
#
|
||||||
# function QT4_USE_MODULES( target [link_type] modules...)
|
# function QT4_USE_MODULES( target [link_type] modules...)
|
||||||
# Make <target> use the <modules> from Qt. Using a Qt module means
|
# Make <target> use the <modules> from Qt. Using a Qt module means
|
||||||
|
@ -495,7 +495,7 @@ macro (_QT4_ADJUST_LIB_VARS _camelCaseBasename)
|
||||||
set(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
|
set(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Make variables changeble to the advanced user
|
# Make variables changeable to the advanced user
|
||||||
mark_as_advanced(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_RELEASE QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
|
mark_as_advanced(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_RELEASE QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
|
||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
|
@ -771,7 +771,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
||||||
endif()
|
endif()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Make variables changeble to the advanced user
|
# Make variables changeable to the advanced user
|
||||||
mark_as_advanced( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
|
mark_as_advanced( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
|
||||||
QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
|
QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ if("${VTK_FIND_VERSION}" VERSION_LESS 4.1)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Construct consitent error messages for use below.
|
# Construct consistent error messages for use below.
|
||||||
set(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake. This is either the root of the build tree, or PREFIX/lib/vtk for an installation.")
|
set(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake. This is either the root of the build tree, or PREFIX/lib/vtk for an installation.")
|
||||||
if(_VTK_40_ALLOW)
|
if(_VTK_40_ALLOW)
|
||||||
set(VTK_DIR_DESCRIPTION "${VTK_DIR_DESCRIPTION} For VTK 4.0, this is the location of UseVTK.cmake. This is either the root of the build tree or PREFIX/include/vtk for an installation.")
|
set(VTK_DIR_DESCRIPTION "${VTK_DIR_DESCRIPTION} For VTK 4.0, this is the location of UseVTK.cmake. This is either the root of the build tree or PREFIX/include/vtk for an installation.")
|
||||||
|
@ -127,7 +127,7 @@ endif()
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
if(VTK_FOUND)
|
if(VTK_FOUND)
|
||||||
# Set USE_VTK_FILE for backward-compatability.
|
# Set USE_VTK_FILE for backward-compatibility.
|
||||||
set(USE_VTK_FILE ${VTK_USE_FILE})
|
set(USE_VTK_FILE ${VTK_USE_FILE})
|
||||||
else()
|
else()
|
||||||
# VTK not found, explain to the user how to specify its location.
|
# VTK not found, explain to the user how to specify its location.
|
||||||
|
|
|
@ -321,7 +321,7 @@ if(WIN32_STYLE_FIND)
|
||||||
rpcrt4
|
rpcrt4
|
||||||
wsock32
|
wsock32
|
||||||
)
|
)
|
||||||
## HACK: feed in to optimized / debug libaries if both were FOUND.
|
## HACK: feed in to optimized / debug libraries if both were FOUND.
|
||||||
set(WXWINDOWS_STATIC_DEBUG_LIBS ${WXWINDOWS_STATIC_DEBUG_LIBS}
|
set(WXWINDOWS_STATIC_DEBUG_LIBS ${WXWINDOWS_STATIC_DEBUG_LIBS}
|
||||||
wxbase26d
|
wxbase26d
|
||||||
wxbase26d_net
|
wxbase26d_net
|
||||||
|
@ -354,7 +354,7 @@ if(WIN32_STYLE_FIND)
|
||||||
##
|
##
|
||||||
|
|
||||||
## if there is at least one shared lib available
|
## if there is at least one shared lib available
|
||||||
## let user choose wether to use shared or static wxwindows libs
|
## let user choose whether to use shared or static wxwindows libs
|
||||||
if(WXWINDOWS_SHARED_LIBRARY OR WXWINDOWS_SHARED_DEBUG_LIBRARY)
|
if(WXWINDOWS_SHARED_LIBRARY OR WXWINDOWS_SHARED_DEBUG_LIBRARY)
|
||||||
## default value OFF because wxWindows MSVS default build is static
|
## default value OFF because wxWindows MSVS default build is static
|
||||||
option(WXWINDOWS_USE_SHARED_LIBS
|
option(WXWINDOWS_USE_SHARED_LIBS
|
||||||
|
@ -606,7 +606,7 @@ else()
|
||||||
../wx/bin
|
../wx/bin
|
||||||
../../wx/bin )
|
../../wx/bin )
|
||||||
|
|
||||||
# check wether wx-config was found:
|
# check whether wx-config was found:
|
||||||
if(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
|
if(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE)
|
||||||
|
|
||||||
# use shared/static wx lib?
|
# use shared/static wx lib?
|
||||||
|
|
|
@ -22,7 +22,7 @@ set(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:")
|
||||||
set(CMAKE_LINK_LIBRARY_FLAG "")
|
set(CMAKE_LINK_LIBRARY_FLAG "")
|
||||||
set(MSVC 1)
|
set(MSVC 1)
|
||||||
|
|
||||||
# hack: if a new cmake (which uses CMAKE__LINKER) runs on an old build tree
|
# hack: if a new cmake (which uses CMAKE_LINKER) runs on an old build tree
|
||||||
# (where link was hardcoded) and where CMAKE_LINKER isn't in the cache
|
# (where link was hardcoded) and where CMAKE_LINKER isn't in the cache
|
||||||
# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
|
# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
|
||||||
# hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex
|
# hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex
|
||||||
|
|
|
@ -132,10 +132,10 @@ macro(ECOS_ADJUST_DIRECTORY _target_FILES )
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# the default ecos config file name
|
# the default ecos config file name
|
||||||
# maybe in the future also out-of-source builds may be possible
|
# maybe in future also out-of-source builds may be possible
|
||||||
set(ECOS_CONFIG_FILE ecos.ecc)
|
set(ECOS_CONFIG_FILE ecos.ecc)
|
||||||
|
|
||||||
#creates the dependancy from all source files on the ecos target.ld,
|
#creates the dependency from all source files on the ecos target.ld,
|
||||||
#adds the command for compiling ecos
|
#adds the command for compiling ecos
|
||||||
macro(ECOS_ADD_TARGET_LIB)
|
macro(ECOS_ADD_TARGET_LIB)
|
||||||
# when building out-of-source, create the ecos/ subdir
|
# when building out-of-source, create the ecos/ subdir
|
||||||
|
|
|
@ -1363,7 +1363,7 @@ void cmCTestTestHandler
|
||||||
tempPath += filename;
|
tempPath += filename;
|
||||||
attempted.push_back(tempPath);
|
attempted.push_back(tempPath);
|
||||||
attemptedConfigs.push_back(ctest->GetConfigType());
|
attemptedConfigs.push_back(ctest->GetConfigType());
|
||||||
// If the file is an OSX bundle then the configtyp
|
// If the file is an OSX bundle then the configtype
|
||||||
// will be at the start of the path
|
// will be at the start of the path
|
||||||
tempPath = ctest->GetConfigType();
|
tempPath = ctest->GetConfigType();
|
||||||
tempPath += "/";
|
tempPath += "/";
|
||||||
|
@ -1374,7 +1374,7 @@ void cmCTestTestHandler
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// no config specified to try some options
|
// no config specified - try some options...
|
||||||
tempPath = filepath;
|
tempPath = filepath;
|
||||||
tempPath += "Release/";
|
tempPath += "Release/";
|
||||||
tempPath += filename;
|
tempPath += filename;
|
||||||
|
|
|
@ -176,7 +176,7 @@ static int FE_Delete_Previous(FORM *);
|
||||||
#define Address_Of_Current_Position_In_Buffer(form) \
|
#define Address_Of_Current_Position_In_Buffer(form) \
|
||||||
Address_Of_Current_Position_In_Nth_Buffer(form,0)
|
Address_Of_Current_Position_In_Nth_Buffer(form,0)
|
||||||
|
|
||||||
/* Logic to decide wether or not a field is actually a field with
|
/* Logic to decide whether or not a field is actually a field with
|
||||||
vertical or horizontal scrolling */
|
vertical or horizontal scrolling */
|
||||||
#define Is_Scroll_Field(field) \
|
#define Is_Scroll_Field(field) \
|
||||||
(((field)->drows > (field)->rows) || \
|
(((field)->drows > (field)->rows) || \
|
||||||
|
@ -2100,7 +2100,7 @@ static int Insert_String(FORM *form, int row, char *txt, int len)
|
||||||
| the wrapping.
|
| the wrapping.
|
||||||
|
|
|
|
||||||
| Return Values : E_OK - no wrapping required or wrapping
|
| Return Values : E_OK - no wrapping required or wrapping
|
||||||
| was successfull
|
| was successful
|
||||||
| E_REQUEST_DENIED -
|
| E_REQUEST_DENIED -
|
||||||
| E_SYSTEM_ERROR - some system error
|
| E_SYSTEM_ERROR - some system error
|
||||||
+--------------------------------------------------------------------------*/
|
+--------------------------------------------------------------------------*/
|
||||||
|
@ -3825,7 +3825,7 @@ int set_field_buffer(FIELD * field, int buffer, const char * value)
|
||||||
(int)(1 + (vlen-len)/((field->rows+field->nrow)*field->cols))))
|
(int)(1 + (vlen-len)/((field->rows+field->nrow)*field->cols))))
|
||||||
RETURN(E_SYSTEM_ERROR);
|
RETURN(E_SYSTEM_ERROR);
|
||||||
|
|
||||||
/* in this case we also have to check, wether or not the remaining
|
/* in this case we also have to check, whether or not the remaining
|
||||||
characters in value are also printable for buffer 0. */
|
characters in value are also printable for buffer 0. */
|
||||||
if (buffer==0)
|
if (buffer==0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -101,7 +101,7 @@ static void Free_Enum_Type(void * argp)
|
||||||
| const unsigned char * buf,
|
| const unsigned char * buf,
|
||||||
| bool ccase )
|
| bool ccase )
|
||||||
|
|
|
|
||||||
| Description : Check wether or not the text in 'buf' matches the
|
| Description : Check whether or not the text in 'buf' matches the
|
||||||
| text in 's', at least partial.
|
| text in 's', at least partial.
|
||||||
|
|
|
|
||||||
| Return Values : NOMATCH - buffer doesn't match
|
| Return Values : NOMATCH - buffer doesn't match
|
||||||
|
|
|
@ -267,7 +267,7 @@ ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf)
|
||||||
std::vector<std::string> expandedArguments;
|
std::vector<std::string> expandedArguments;
|
||||||
mf.ExpandArguments(lff.Arguments, expandedArguments);
|
mf.ExpandArguments(lff.Arguments, expandedArguments);
|
||||||
// if the endfunction has arguments then make sure
|
// if the endfunction has arguments then make sure
|
||||||
// they match the ones in the openeing function command
|
// they match the ones in the opening function command
|
||||||
if ((expandedArguments.empty() ||
|
if ((expandedArguments.empty() ||
|
||||||
(expandedArguments[0] == this->Args[0])))
|
(expandedArguments[0] == this->Args[0])))
|
||||||
{
|
{
|
||||||
|
|
|
@ -449,7 +449,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collext explicit util dependencies (add_dependencies).
|
// Collect explicit util dependencies (add_dependencies).
|
||||||
std::set<cmTarget*> utilDepends;
|
std::set<cmTarget*> utilDepends;
|
||||||
for(TargetDependSet::const_iterator di = depends.begin();
|
for(TargetDependSet::const_iterator di = depends.begin();
|
||||||
di != depends.end(); ++di)
|
di != depends.end(); ++di)
|
||||||
|
|
|
@ -61,7 +61,7 @@ bool cmIncludeCommand
|
||||||
noPolicyScope = true;
|
noPolicyScope = true;
|
||||||
}
|
}
|
||||||
else if(i > 1) // compat.: in previous cmake versions the second
|
else if(i > 1) // compat.: in previous cmake versions the second
|
||||||
// parameter was ignore if it wasn't "OPTIONAL"
|
// parameter was ignored if it wasn't "OPTIONAL"
|
||||||
{
|
{
|
||||||
std::string errorText = "called with invalid argument: ";
|
std::string errorText = "called with invalid argument: ";
|
||||||
errorText += args[i];
|
errorText += args[i];
|
||||||
|
|
|
@ -1304,7 +1304,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
std::string unmodified = s;
|
std::string unmodified = s;
|
||||||
unmodified += s2;
|
unmodified += s2;
|
||||||
// if there is no restriction on the length of make variables
|
// if there is no restriction on the length of make variables
|
||||||
// and there are no "." charactors in the string, then return the
|
// and there are no "." characters in the string, then return the
|
||||||
// unmodified combination.
|
// unmodified combination.
|
||||||
if((!this->MakefileVariableSize && unmodified.find('.') == s.npos)
|
if((!this->MakefileVariableSize && unmodified.find('.') == s.npos)
|
||||||
&& (!this->MakefileVariableSize && unmodified.find('+') == s.npos)
|
&& (!this->MakefileVariableSize && unmodified.find('+') == s.npos)
|
||||||
|
@ -1345,7 +1345,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the string is greater the 32 chars it is an invalid vairable name
|
// if the string is greater than 32 chars it is an invalid variable name
|
||||||
// for borland make
|
// for borland make
|
||||||
if(static_cast<int>(ret.size()) > this->MakefileVariableSize)
|
if(static_cast<int>(ret.size()) > this->MakefileVariableSize)
|
||||||
{
|
{
|
||||||
|
@ -1353,8 +1353,8 @@ cmLocalUnixMakefileGenerator3
|
||||||
int size = keep + 3;
|
int size = keep + 3;
|
||||||
std::string str1 = s;
|
std::string str1 = s;
|
||||||
std::string str2 = s2;
|
std::string str2 = s2;
|
||||||
// we must shorten the combined string by 4 charactors
|
// we must shorten the combined string by 4 characters
|
||||||
// keep no more than 24 charactors from the second string
|
// keep no more than 24 characters from the second string
|
||||||
if(static_cast<int>(str2.size()) > keep)
|
if(static_cast<int>(str2.size()) > keep)
|
||||||
{
|
{
|
||||||
str2 = str2.substr(0, keep);
|
str2 = str2.substr(0, keep);
|
||||||
|
|
|
@ -2086,7 +2086,7 @@ void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,
|
||||||
}
|
}
|
||||||
else if(i==-1)
|
else if(i==-1)
|
||||||
{
|
{
|
||||||
// group does not exists nor belong to any existing group
|
// group does not exist nor belong to any existing group
|
||||||
// add its first component
|
// add its first component
|
||||||
this->SourceGroups.push_back(cmSourceGroup(name[0].c_str(), regex));
|
this->SourceGroups.push_back(cmSourceGroup(name[0].c_str(), regex));
|
||||||
sg = this->GetSourceGroup(currentName);
|
sg = this->GetSourceGroup(currentName);
|
||||||
|
|
|
@ -505,7 +505,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
|
||||||
const std::string objPath = GetTarget()->GetSupportDirectory();
|
const std::string objPath = GetTarget()->GetSupportDirectory();
|
||||||
vars["OBJECT_DIR"] = ConvertToNinjaPath(objPath.c_str());
|
vars["OBJECT_DIR"] = ConvertToNinjaPath(objPath.c_str());
|
||||||
EnsureDirectoryExists(objPath);
|
EnsureDirectoryExists(objPath);
|
||||||
// ar.exe can't handle backslashes in rsp files (implictly used by gcc)
|
// ar.exe can't handle backslashes in rsp files (implicitly used by gcc)
|
||||||
std::string& linkLibraries = vars["LINK_LIBRARIES"];
|
std::string& linkLibraries = vars["LINK_LIBRARIES"];
|
||||||
std::replace(linkLibraries.begin(), linkLibraries.end(), '\\', '/');
|
std::replace(linkLibraries.begin(), linkLibraries.end(), '\\', '/');
|
||||||
}
|
}
|
||||||
|
|
|
@ -696,7 +696,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
|
||||||
std::string ownMocHeaderFile;
|
std::string ownMocHeaderFile;
|
||||||
|
|
||||||
std::string::size_type matchOffset = 0;
|
std::string::size_type matchOffset = 0;
|
||||||
// first a simply string check for "moc" is *much* faster than the regexp,
|
// first a simple string check for "moc" is *much* faster than the regexp,
|
||||||
// and if the string search already fails, we don't have to try the
|
// and if the string search already fails, we don't have to try the
|
||||||
// expensive regexp
|
// expensive regexp
|
||||||
if ((strstr(contentsString.c_str(), "moc") != NULL)
|
if ((strstr(contentsString.c_str(), "moc") != NULL)
|
||||||
|
@ -870,7 +870,7 @@ void cmQtAutomoc::StrictParseCppFile(const std::string& absFilename,
|
||||||
bool dotMocIncluded = false;
|
bool dotMocIncluded = false;
|
||||||
|
|
||||||
std::string::size_type matchOffset = 0;
|
std::string::size_type matchOffset = 0;
|
||||||
// first a simply string check for "moc" is *much* faster than the regexp,
|
// first a simple string check for "moc" is *much* faster than the regexp,
|
||||||
// and if the string search already fails, we don't have to try the
|
// and if the string search already fails, we don't have to try the
|
||||||
// expensive regexp
|
// expensive regexp
|
||||||
if ((strstr(contentsString.c_str(), "moc") != NULL)
|
if ((strstr(contentsString.c_str(), "moc") != NULL)
|
||||||
|
|
|
@ -56,7 +56,7 @@ public:
|
||||||
|
|
||||||
typedef void (*ErrorCallback)(const char*, const char*, bool&, void*);
|
typedef void (*ErrorCallback)(const char*, const char*, bool&, void*);
|
||||||
/**
|
/**
|
||||||
* Set the function used by GUI's to display error messages
|
* Set the function used by GUIs to display error messages
|
||||||
* Function gets passed: message as a const char*,
|
* Function gets passed: message as a const char*,
|
||||||
* title as a const char*, and a reference to bool that when
|
* title as a const char*, and a reference to bool that when
|
||||||
* set to false, will disable furthur messages (cancel).
|
* set to false, will disable furthur messages (cancel).
|
||||||
|
|
|
@ -228,7 +228,7 @@ cmVisualStudioGeneratorOptions
|
||||||
}
|
}
|
||||||
if(this->Version >= cmLocalVisualStudioGenerator::VS10)
|
if(this->Version >= cmLocalVisualStudioGenerator::VS10)
|
||||||
{
|
{
|
||||||
// if there are configuration specifc flags, then
|
// if there are configuration specific flags, then
|
||||||
// use the configuration specific tag for PreprocessorDefinitions
|
// use the configuration specific tag for PreprocessorDefinitions
|
||||||
if(this->Configuration.size())
|
if(this->Configuration.size())
|
||||||
{
|
{
|
||||||
|
|
|
@ -506,7 +506,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
|
||||||
|
|
||||||
/* Create new output read handle and the input write handle. Set
|
/* Create new output read handle and the input write handle. Set
|
||||||
* the inheritance properties to FALSE. Otherwise, the child inherits
|
* the inheritance properties to FALSE. Otherwise, the child inherits
|
||||||
* the these handles; resulting in non-closeable handles to the pipes
|
* these handles; resulting in non-closeable handles to the pipes
|
||||||
* being created. */
|
* being created. */
|
||||||
fSuccess = DuplicateHandle(GetCurrentProcess(), this->hChildStdinWr,
|
fSuccess = DuplicateHandle(GetCurrentProcess(), this->hChildStdinWr,
|
||||||
GetCurrentProcess(), &this->hChildStdinWrDup, 0,
|
GetCurrentProcess(), &this->hChildStdinWrDup, 0,
|
||||||
|
|
|
@ -69,7 +69,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Start the process in the directory path. Make sure that the
|
* Start the process in the directory path. Make sure that the
|
||||||
* executable is either in the path or specify the full path. The
|
* executable is either in the path or specify the full path. The
|
||||||
* argument verbose specifies wether or not to display output while
|
* argument verbose specifies whether or not to display output while
|
||||||
* it is being generated.
|
* it is being generated.
|
||||||
*/
|
*/
|
||||||
bool StartProcess(const char*, const char* path, bool verbose);
|
bool StartProcess(const char*, const char* path, bool verbose);
|
||||||
|
|
|
@ -2365,7 +2365,7 @@ int cmake::ActualConfigure()
|
||||||
// EXECUTABLE_OUTPUT_PATH. They are now documented as old-style and
|
// EXECUTABLE_OUTPUT_PATH. They are now documented as old-style and
|
||||||
// should no longer be used. Therefore we present them only if the
|
// should no longer be used. Therefore we present them only if the
|
||||||
// project requires compatibility with CMake 2.4. We detect this
|
// project requires compatibility with CMake 2.4. We detect this
|
||||||
// here by looking for the old CMAKE_BACKWARDS_COMPATABILITY
|
// here by looking for the old CMAKE_BACKWARDS_COMPATIBILITY
|
||||||
// variable created when CMP0001 is not set to NEW.
|
// variable created when CMP0001 is not set to NEW.
|
||||||
if(this->GetCacheManager()->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
|
if(this->GetCacheManager()->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
|
||||||
{
|
{
|
||||||
|
@ -4117,7 +4117,7 @@ int cmake::WindowsCEEnvironment(const char* version, const std::string& name)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For visual studio 2005 and newer manifest files need to be embeded into
|
// For visual studio 2005 and newer manifest files need to be embedded into
|
||||||
// exe and dll's. This code does that in such a way that incremental linking
|
// exe and dll's. This code does that in such a way that incremental linking
|
||||||
// still works.
|
// still works.
|
||||||
int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
|
int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
|
||||||
|
|
|
@ -35,7 +35,7 @@ class cmGeneratedFileStream;
|
||||||
/** \brief Represents a cmake invocation.
|
/** \brief Represents a cmake invocation.
|
||||||
*
|
*
|
||||||
* This class represents a cmake invocation. It is the top level class when
|
* This class represents a cmake invocation. It is the top level class when
|
||||||
* running cmake. Most cmake based GUIS should primarily create an instance
|
* running cmake. Most cmake based GUIs should primarily create an instance
|
||||||
* of this class and communicate with it.
|
* of this class and communicate with it.
|
||||||
*
|
*
|
||||||
* The basic process for a GUI is as follows:
|
* The basic process for a GUI is as follows:
|
||||||
|
@ -255,7 +255,7 @@ class cmake
|
||||||
typedef void (*ProgressCallbackType)
|
typedef void (*ProgressCallbackType)
|
||||||
(const char*msg, float progress, void *);
|
(const char*msg, float progress, void *);
|
||||||
/**
|
/**
|
||||||
* Set the function used by GUI's to receive progress updates
|
* Set the function used by GUIs to receive progress updates
|
||||||
* Function gets passed: message as a const char*, a progress
|
* Function gets passed: message as a const char*, a progress
|
||||||
* amount ranging from 0 to 1.0 and client data. The progress
|
* amount ranging from 0 to 1.0 and client data. The progress
|
||||||
* number provided may be negative in cases where a message is
|
* number provided may be negative in cases where a message is
|
||||||
|
|
|
@ -70,7 +70,7 @@ target_compile_definitions(CompatibleInterface
|
||||||
|
|
||||||
# The COMPATIBLE_INTERFACE_* properties are only read from dependencies
|
# The COMPATIBLE_INTERFACE_* properties are only read from dependencies
|
||||||
# in the interface. Populating it on the CompatibleInterface target does
|
# in the interface. Populating it on the CompatibleInterface target does
|
||||||
# not have any affect on the interpretation of the INTERFACE variants
|
# not have any effect on the interpretation of the INTERFACE variants
|
||||||
# in dependencies.
|
# in dependencies.
|
||||||
set_property(TARGET iface1 PROPERTY
|
set_property(TARGET iface1 PROPERTY
|
||||||
INTERFACE_NON_RELEVANT_PROP ON
|
INTERFACE_NON_RELEVANT_PROP ON
|
||||||
|
|
|
@ -3683,7 +3683,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
|
||||||
/* seek out the next path component */
|
/* seek out the next path component */
|
||||||
if (slash_pos-cur_pos) {
|
if (slash_pos-cur_pos) {
|
||||||
/* we skip empty path components, like "x//y" since the FTP command
|
/* we skip empty path components, like "x//y" since the FTP command
|
||||||
CWD requires a parameter and a non-existant parameter a) doesn't
|
CWD requires a parameter and a non-existent parameter a) doesn't
|
||||||
work on many servers and b) has no effect on the others. */
|
work on many servers and b) has no effect on the others. */
|
||||||
int len = (int)(slash_pos - cur_pos + absolute_dir);
|
int len = (int)(slash_pos - cur_pos + absolute_dir);
|
||||||
ftpc->dirs[ftpc->dirdepth] = curl_easy_unescape(conn->data,
|
ftpc->dirs[ftpc->dirdepth] = curl_easy_unescape(conn->data,
|
||||||
|
|
|
@ -178,7 +178,7 @@ static bool pickoneauth(struct auth *pick)
|
||||||
picked = TRUE;
|
picked = TRUE;
|
||||||
|
|
||||||
/* The order of these checks is highly relevant, as this will be the order
|
/* The order of these checks is highly relevant, as this will be the order
|
||||||
of preference in case of the existance of multiple accepted types. */
|
of preference in case of the existence of multiple accepted types. */
|
||||||
if(avail & CURLAUTH_GSSNEGOTIATE)
|
if(avail & CURLAUTH_GSSNEGOTIATE)
|
||||||
pick->picked = CURLAUTH_GSSNEGOTIATE;
|
pick->picked = CURLAUTH_GSSNEGOTIATE;
|
||||||
else if(avail & CURLAUTH_DIGEST)
|
else if(avail & CURLAUTH_DIGEST)
|
||||||
|
|
|
@ -621,7 +621,7 @@ typedef CURLcode (*Curl_done_func)(struct connectdata *, CURLcode, bool);
|
||||||
* Store's request specific data in the easy handle (SessionHandle).
|
* Store's request specific data in the easy handle (SessionHandle).
|
||||||
* Previously, these members were on the connectdata struct but since
|
* Previously, these members were on the connectdata struct but since
|
||||||
* a conn struct may now be shared between different SessionHandles,
|
* a conn struct may now be shared between different SessionHandles,
|
||||||
* we store connection-specifc data here.
|
* we store connection-specific data here.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
struct HandleData {
|
struct HandleData {
|
||||||
|
|
|
@ -407,7 +407,7 @@ bid_keyword(const char *p, ssize_t len)
|
||||||
if (l > 0)
|
if (l > 0)
|
||||||
return (l);
|
return (l);
|
||||||
}
|
}
|
||||||
return (0);/* Unkown key */
|
return (0);/* Unknown key */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -869,7 +869,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
|
||||||
See inflateBack() for the usage of these routines.
|
See inflateBack() for the usage of these routines.
|
||||||
|
|
||||||
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
|
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
|
||||||
the paramaters are invalid, Z_MEM_ERROR if the internal state could not
|
the parameters are invalid, Z_MEM_ERROR if the internal state could not
|
||||||
be allocated, or Z_VERSION_ERROR if the version of the library does not
|
be allocated, or Z_VERSION_ERROR if the version of the library does not
|
||||||
match the version of the header file.
|
match the version of the header file.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue