fix the same typos as found by Debian in other places, too
This commit is contained in:
parent
d36d29f1f0
commit
7ec2ebdbcf
|
@ -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 "")
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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}")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue