diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-24 20:06:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-30 14:27:44 (GMT) |
| commit | 80112da54e1aa8e64f73a2a5a6a4f73431ac6764 (patch) | |
| tree | ab12483eed9e9950336b4dc511418fd1423d74d1 /bootstrap | |
| parent | 955b96629e05bf2ddb6c94fa7a130e2b5b744782 (diff) | |
| parent | e83cc94dcd250e90143450bc916353b449043081 (diff) | |
| download | CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.zip CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.gz CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.bz2 | |
Merge topic 'AutomocUseTargetProperties' into export-sets
Conflicts:
Source/cmGlobalGenerator.h
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -204,6 +204,9 @@ CMAKE_CXX_SOURCES="\ cmInstallDirectoryGenerator \ cmGeneratedFileStream \ cmGeneratorTarget \ + cmGeneratorExpressionEvaluator \ + cmGeneratorExpressionLexer \ + cmGeneratorExpressionParser \ cmGeneratorExpression \ cmGlobalGenerator \ cmLocalGenerator \ |