diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2013-06-03 17:42:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-03 17:43:52 (GMT) |
| commit | e4e09212c58995a6cfde7d101bc02fce0f7829be (patch) | |
| tree | 219aa9a80e2c182d3be38d3cccf8f3809c585720 /Source/cmTargetCompileDefinitionsCommand.h | |
| parent | c9b75dcd734e2dd09eadbd9b16a6497bae95941c (diff) | |
| parent | a4d8c64d10105fd4448ffde6a5d2fb74c1bb4f57 (diff) | |
| download | CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.zip CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.tar.gz CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.tar.bz2 | |
Merge branch 'master' into escape-regex-specials-in-path
Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining
changes from both sides.
Diffstat (limited to 'Source/cmTargetCompileDefinitionsCommand.h')
| -rw-r--r-- | Source/cmTargetCompileDefinitionsCommand.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmTargetCompileDefinitionsCommand.h b/Source/cmTargetCompileDefinitionsCommand.h index ec9b071..22d8fa8 100644 --- a/Source/cmTargetCompileDefinitionsCommand.h +++ b/Source/cmTargetCompileDefinitionsCommand.h @@ -70,6 +70,7 @@ public: "Arguments to target_compile_definitions may use \"generator " "expressions\" with the syntax \"$<...>\". " CM_DOCUMENT_COMMAND_GENERATOR_EXPRESSIONS + CM_DOCUMENT_LANGUAGE_GENERATOR_EXPRESSIONS ; } |