kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-typos-12975'

Browse Source 
7ec2ebd fix the same typos as found by Debian in other places, too
d36d29f various typo and formatting fixes in manual pages (#12975)
This commit is contained in:
David Cole 2012-02-21 15:56:13 -05:00 committed by CMake Topic Stage
commit 751e492840
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CPackRPM.cmake
View File

@ -183,7 +183,7 @@
# The refered script file(s) will be read and directly # The refered script file(s) will be read and directly
# put after the %pre or %preun section # put after the %pre or %preun section
# If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for # If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
# each component can be overriden with # each component can be overridden with
# CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE and # CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE and
# CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE # CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE
# One may verify which scriptlet has been included with # One may verify which scriptlet has been included with
@ -198,7 +198,7 @@
# The refered script file(s) will be read and directly # The refered script file(s) will be read and directly
# put after the %post or %postun section # put after the %post or %postun section
# If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for # If CPACK_RPM_COMPONENT_INSTALL is set to ON the (un)install script for
# each component can be overriden with # each component can be overridden with
# CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE and # CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE and
# CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE # CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE
# One may verify which scriptlet has been included with # One may verify which scriptlet has been included with
@ -209,7 +209,7 @@
# CPACK_RPM_<COMPONENT>_USER_FILELIST # CPACK_RPM_<COMPONENT>_USER_FILELIST
# Mandatory : NO # Mandatory : NO
# Default : - # Default : -
# May be used to explicitely specify %(<directive>) file line # May be used to explicitly specify %(<directive>) file line
# in the spec file. Like %config(noreplace) or any other directive # in the spec file. Like %config(noreplace) or any other directive
# that be found in the %files section. Since CPackRPM is generating # that be found in the %files section. Since CPackRPM is generating
# the list of files (and directories) the user specified files of # the list of files (and directories) the user specified files of

2
Modules/FindCUDA.cmake
View File

@ -906,7 +906,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
message( FATAL_ERROR "Invalid format flag passed to CUDA_WRAP_SRCS: '${format}'. Use OBJ or PTX.") message( FATAL_ERROR "Invalid format flag passed to CUDA_WRAP_SRCS: '${format}'. Use OBJ or PTX.")
endif() endif()
# Set up all the command line flags here, so that they can be overriden on a per target basis. # Set up all the command line flags here, so that they can be overridden on a per target basis.
set(nvcc_flags "") set(nvcc_flags "")

2
Modules/FindImageMagick.cmake
View File

@ -169,7 +169,7 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS}
LIST(APPEND ImageMagick_REQUIRED_VARS ImageMagick_${component}_EXECUTABLE) LIST(APPEND ImageMagick_REQUIRED_VARS ImageMagick_${component}_EXECUTABLE)
ENDIF(is_requested GREATER -1) ENDIF(is_requested GREATER -1)
ELSEIF(ImageMagick_${component}_EXECUTABLE) ELSEIF(ImageMagick_${component}_EXECUTABLE)
# if no components were requested explicitely put all (default) executables # if no components were requested explicitly put all (default) executables
# in the list # in the list
LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES "${ImageMagick_${component}_EXECUTABLE}") LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES "${ImageMagick_${component}_EXECUTABLE}")
ENDIF(ImageMagick_FIND_COMPONENTS) ENDIF(ImageMagick_FIND_COMPONENTS)

2
Modules/UseJava.cmake
View File

@ -121,7 +121,7 @@
# [VERSION TRUE|FALSE] # [VERSION TRUE|FALSE]
# ) # )
# #
# Create jave documentation based on files or packages. For more # Create java documentation based on files or packages. For more
# details please read the javadoc manpage. # details please read the javadoc manpage.
# #
# There are two main signatures for create_javadoc. The first # There are two main signatures for create_javadoc. The first

8
Source/cmTarget.cxx
View File

@ -1047,10 +1047,10 @@ void cmTarget::DefineProperties(cmake *cm)
"Can be set to one or more UUIDs recognized by Visual Studio " "Can be set to one or more UUIDs recognized by Visual Studio "
"to indicate the type of project. This value is copied " "to indicate the type of project. This value is copied "
"verbatim into the generated project file. Example for a " "verbatim into the generated project file. Example for a "
"managed C++ unit testing project: \"" "managed C++ unit testing project:\n"
"{3AC096D0-A1C2-E12C-1390-A8335801FDAB};" " {3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\". UUIDs are " "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\n"
"semicolon-delimited."); "UUIDs are semicolon-delimited.");
cm->DefineProperty cm->DefineProperty
("VS_GLOBAL_KEYWORD", cmProperty::TARGET, ("VS_GLOBAL_KEYWORD", cmProperty::TARGET,
"Visual Studio project keyword.", "Visual Studio project keyword.",

6
Tests/CMakeOnly/AllFindModules/CMakeLists.txt
View File

@ -16,16 +16,16 @@ macro(do_find MODULE_NAME)
endmacro(do_find) endmacro(do_find)
# It is only possible to use either Qt3 or Qt4 in one project. # It is only possible to use either Qt3 or Qt4 in one project.
# Since FindQt will complain if both are found we explicitely # Since FindQt will complain if both are found we explicitly request Qt4 here
# filter out this and FindQt3. FindKDE3 also depends on Qt3 and # and filter out FindQt3. FindKDE3 also depends on Qt3 and
# is therefore also blocked # is therefore also blocked
set(DESIRED_QT_VERSION 4)
set(NO_QT4_MODULES "Qt3" "KDE3") set(NO_QT4_MODULES "Qt3" "KDE3")
# These modules are named Find*.cmake, but are nothing that works in # These modules are named Find*.cmake, but are nothing that works in
# find_package(). # find_package().
set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage") set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
set(DESIRED_QT_VERSION 4)
foreach(FIND_MODULE ${FIND_MODULES}) foreach(FIND_MODULE ${FIND_MODULES})
string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}") string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")