summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2012-02-18 15:13:34 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2012-02-18 15:13:34 (GMT)
commit7ec2ebdbcfcc90fca928ca79cb3b719177503d2d (patch)
treee9681e5e45a6ecb256341317e6ff0ff19b97da43
parentd36d29f1f079c58bf7d5993da442e4296c7f82a8 (diff)
downloadCMake-7ec2ebdbcfcc90fca928ca79cb3b719177503d2d.zip
CMake-7ec2ebdbcfcc90fca928ca79cb3b719177503d2d.tar.gz
CMake-7ec2ebdbcfcc90fca928ca79cb3b719177503d2d.tar.bz2
fix the same typos as found by Debian in other places, too
-rw-r--r--Modules/FindCUDA.cmake2
-rw-r--r--Modules/FindImageMagick.cmake2
-rw-r--r--Tests/CMakeOnly/AllFindModules/CMakeLists.txt6
3 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 4d91a92..9f8d575 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -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.")
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 "")
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 75523f4..52d575b 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -169,7 +169,7 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS}
LIST(APPEND ImageMagick_REQUIRED_VARS ImageMagick_${component}_EXECUTABLE)
ENDIF(is_requested GREATER -1)
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
LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES "${ImageMagick_${component}_EXECUTABLE}")
ENDIF(ImageMagick_FIND_COMPONENTS)
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index f76f0d9..ec09aa5 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -16,16 +16,16 @@ macro(do_find MODULE_NAME)
endmacro(do_find)
# It is only possible to use either Qt3 or Qt4 in one project.
-# Since FindQt will complain if both are found we explicitely
-# filter out this and FindQt3. FindKDE3 also depends on Qt3 and
+# Since FindQt will complain if both are found we explicitly request Qt4 here
+# and filter out FindQt3. FindKDE3 also depends on Qt3 and
# is therefore also blocked
+set(DESIRED_QT_VERSION 4)
set(NO_QT4_MODULES "Qt3" "KDE3")
# These modules are named Find*.cmake, but are nothing that works in
# find_package().
set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
-set(DESIRED_QT_VERSION 4)
foreach(FIND_MODULE ${FIND_MODULES})
string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")