diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
tree | d084ad2615012d53c50a230821761349eb978d56 /cmake/Modules/GrMiscUtils.cmake | |
parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) |
Merge branch 'master' into next
Diffstat (limited to 'cmake/Modules/GrMiscUtils.cmake')
-rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index b158a08d07..79bb70c03e 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -185,7 +185,7 @@ endfunction(GR_LIBRARY_FOO) # GR_GEN_TARGET_DEPS(unique_name target_deps <target1> <target2> ...) # ADD_CUSTOM_COMMAND(<the usual args> ${target_deps}) # -# Custom command cant depend on targets, but can depend on executables, +# Custom command can't depend on targets, but can depend on executables, # and executables can depend on targets. So this is the process: ######################################################################## function(GR_GEN_TARGET_DEPS name var) @@ -204,7 +204,7 @@ function(GR_GEN_TARGET_DEPS name var) endif(ARGN) if(CMAKE_CROSSCOMPILING) - set(${var} "DEPENDS;${name}" PARENT_SCOPE) #cant call command when cross + set(${var} "DEPENDS;${name}" PARENT_SCOPE) #can't call command when cross else() set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE) endif() |