Fix spelling and typos (product names)
API, Borland, MinGW, UNIX, Mac OS X.
This commit is contained in:
Andreas Mohr
Brad King
parent
bf019d765d
commit
f57800d6f5
|
|
@ -140,7 +140,7 @@ if(WIN32 AND NOT CYGWIN)
|
|||
|
||||
set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
|
||||
elseif(MINGW)
|
||||
# same player, for MingW
|
||||
# same player, for MinGW
|
||||
set(LIB_EAY_NAMES libeay32)
|
||||
set(SSL_EAY_NAMES ssleay32)
|
||||
if(CMAKE_CROSS_COMPILING)
|
||||
|
|
|
|||
|
|
@ -635,10 +635,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|||
)
|
||||
endif()
|
||||
|
||||
# try dropping a hint if trying to use Visual Studio with Qt built by mingw
|
||||
# try dropping a hint if trying to use Visual Studio with Qt built by MinGW
|
||||
if(NOT QT_QTCORE_LIBRARY_RELEASE AND MSVC)
|
||||
if(EXISTS ${QT_LIBRARY_DIR_TMP}/libqtmain.a)
|
||||
message( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by mingw. Those compilers do not produce code compatible with each other.")
|
||||
message( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by MinGW. Those compilers do not produce code compatible with each other.")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ QModelIndex QCMakeCacheView::moveCursor(CursorAction act,
|
|||
void QCMakeCacheView::setShowAdvanced(bool s)
|
||||
{
|
||||
#if QT_VERSION >= 040300
|
||||
// new 4.3 api that needs to be called. what about an older Qt?
|
||||
// new 4.3 API that needs to be called. what about an older Qt?
|
||||
this->SearchFilter->invalidate();
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -129,9 +129,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
" needed to build the output of CMake. If the "
|
||||
"generator selected was Visual Studio 6, the "
|
||||
"CMAKE_BUILD_TOOL will be set to msdev, for "
|
||||
"Unix makefiles it will be set to make or gmake, "
|
||||
"Unix Makefiles it will be set to make or gmake, "
|
||||
"and for Visual Studio 7 it set to devenv. For "
|
||||
"Nmake Makefiles the value is nmake. This can be "
|
||||
"NMake Makefiles the value is nmake. This can be "
|
||||
"useful for adding special flags and commands based"
|
||||
" on the final build environment. ", false,
|
||||
"Variables that Provide Information");
|
||||
|
|
@ -940,7 +940,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
"which CMake is targeting. On systems that "
|
||||
"have the uname command, this variable is set "
|
||||
"to the output of uname -s. Linux, Windows, "
|
||||
" and Darwin for Mac OSX are the values found "
|
||||
" and Darwin for Mac OS X are the values found "
|
||||
" on the big three operating systems." ,false,
|
||||
"Variables That Describe the System");
|
||||
cm->DefineProperty
|
||||
|
|
@ -999,20 +999,22 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
|
||||
cm->DefineProperty
|
||||
("APPLE", cmProperty::VARIABLE,
|
||||
"True if running on Mac OSX.",
|
||||
"Set to true on Mac OSX.",false,
|
||||
"True if running on Mac OS X.",
|
||||
"Set to true on Mac OS X."
|
||||
,false,
|
||||
"Variables That Describe the System");
|
||||
|
||||
cm->DefineProperty
|
||||
("BORLAND", cmProperty::VARIABLE,
|
||||
"True if the borland compiler is being used.",
|
||||
"True if the Borland compiler is being used.",
|
||||
"This is set to true if the Borland compiler is being used.",false,
|
||||
"Variables That Describe the System");
|
||||
|
||||
cm->DefineProperty
|
||||
("CYGWIN", cmProperty::VARIABLE,
|
||||
"True for cygwin.",
|
||||
"Set to true when using CYGWIN.",false,
|
||||
"True for Cygwin.",
|
||||
"Set to true when using Cygwin."
|
||||
,false,
|
||||
"Variables That Describe the System");
|
||||
|
||||
cm->DefineProperty
|
||||
|
|
@ -1110,8 +1112,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
|
||||
cm->DefineProperty
|
||||
("CMAKE_HOST_APPLE", cmProperty::VARIABLE,
|
||||
"True for Apple OSX operating systems.",
|
||||
"Set to true when the host system is Apple OSX.",
|
||||
"True for Apple OS X operating systems.",
|
||||
"Set to true when the host system is Apple OS X.",
|
||||
false,
|
||||
"Variables That Describe the System");
|
||||
|
||||
|
|
@ -1125,7 +1127,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
cm->DefineProperty
|
||||
("CMAKE_HOST_WIN32", cmProperty::VARIABLE,
|
||||
"True on windows systems, including win64.",
|
||||
"Set to true when the host system is Windows and on cygwin.",false,
|
||||
"Set to true when the host system is Windows and on Cygwin."
|
||||
,false,
|
||||
"Variables That Describe the System");
|
||||
|
||||
cm->DefineProperty
|
||||
|
|
@ -1198,7 +1201,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
|
|||
|
||||
cm->DefineProperty
|
||||
("CMAKE_INSTALL_NAME_DIR", cmProperty::VARIABLE,
|
||||
"Mac OSX directory name for installed targets.",
|
||||
"Mac OS X directory name for installed targets.",
|
||||
"CMAKE_INSTALL_NAME_DIR is used to initialize the "
|
||||
"INSTALL_NAME_DIR property on all targets. See that target "
|
||||
"property for more information.",
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public:
|
|||
"are common values for this property."
|
||||
"\n"
|
||||
"For shared libraries VERSION and SOVERSION can be used to specify "
|
||||
"the build version and api version respectively. When building or "
|
||||
"the build version and API version respectively. When building or "
|
||||
"installing appropriate symlinks are created if the platform "
|
||||
"supports symlinks and the linker supports so-names. "
|
||||
"If only one of both is specified the missing is assumed to have "
|
||||
|
|
|
|||
|
|
@ -1041,7 +1041,7 @@ void cmTarget::DefineProperties(cmake *cm)
|
|||
("SOVERSION", cmProperty::TARGET,
|
||||
"What version number is this target.",
|
||||
"For shared libraries VERSION and SOVERSION can be used to specify "
|
||||
"the build version and api version respectively. When building or "
|
||||
"the build version and API version respectively. When building or "
|
||||
"installing appropriate symlinks are created if the platform "
|
||||
"supports symlinks and the linker supports so-names. "
|
||||
"If only one of both is specified the missing is assumed to have "
|
||||
|
|
@ -1079,7 +1079,7 @@ void cmTarget::DefineProperties(cmake *cm)
|
|||
("VERSION", cmProperty::TARGET,
|
||||
"What version number is this target.",
|
||||
"For shared libraries VERSION and SOVERSION can be used to specify "
|
||||
"the build version and api version respectively. When building or "
|
||||
"the build version and API version respectively. When building or "
|
||||
"installing appropriate symlinks are created if the platform "
|
||||
"supports symlinks and the linker supports so-names. "
|
||||
"If only one of both is specified the missing is assumed to have "
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ static int process( const std::string& srcfilename,
|
|||
|
||||
int main() {
|
||||
|
||||
// Use the Win32 api instead of argc/argv so we can avoid interpreting the
|
||||
// Use the Win32 API instead of argc/argv so we can avoid interpreting the
|
||||
// rest of command line after the .d and .obj. Custom parsing seemed
|
||||
// preferable to the ugliness you get into in trying to re-escape quotes for
|
||||
// subprocesses, so by avoiding argc/argv, the subprocess is called with
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ int cert_stuff(struct connectdata *conn,
|
|||
failf(data, "no key set to load from crypto engine\n");
|
||||
return 0;
|
||||
}
|
||||
/* the typecast below was added to please mingw32 */
|
||||
/* the typecast below was added to please MinGW32 */
|
||||
priv_key = (EVP_PKEY *)
|
||||
ENGINE_load_private_key(conn->data->state.engine,key_file,
|
||||
#ifdef HAVE_ENGINE_LOAD_FOUR_ARGS
|
||||
|
|
|
|||
Loading…
Reference in New Issue