[Cmake-commits] CMake branch, master, updated. v2.8.5-250-g39f0fa7

David Cole david.cole at kitware.com
Thu Aug 25 15:40:35 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  39f0fa725e71c62eda5a039aba2098bef348bb9b (commit)
       via  920a046015799a14374e5c69072aa14f2723fda0 (commit)
       via  b00463f06c80529f02c489872458345790f6cd48 (commit)
       via  e78ce44b3598807bd401494d484601d9f43bd8b4 (commit)
       via  71165e943edb3ba80a0533a640ff6abffb4bcf64 (commit)
       via  1879bcc09cb180efec041ccd5b1e42c47b790084 (commit)
       via  678e12448140017f7b64c6307afb53b500910f46 (commit)
       via  71c29d11b3d089dbc9fb403ceed7999419615810 (commit)
       via  afb3edc18149f48be6e1690c7d9b1c8f6816a056 (commit)
       via  add30e9008fcb4d5277692958aac7f933539f983 (commit)
       via  7e6d84568c8c390fc53cbaaf70f6839e3cf4ebd7 (commit)
       via  2963d0b078bf9302cab37d9def16776bde45dd67 (commit)
       via  77a5c6e0d8c995f56fa1248443de0260384acca3 (commit)
       via  bf8ef778a317fd7cd82bcc658fc734bf3f29911e (commit)
       via  d045fd4ec5d88658988c8878b313b2bf7924f40f (commit)
       via  50cd6cef925a53dfbbb820ae7343981dcf00f36c (commit)
       via  cbaac2a587d8457b69d832e2c63de8fb755ec64d (commit)
       via  c27607baf860b6c57db84f21a298ad8257ff7153 (commit)
       via  24d9b7d7452bfd9b3d7cea670a3a5a2e9f5b2f16 (commit)
       via  58b7fe65453f1d4b25537950de2277af2951fd85 (commit)
       via  72caf4d1787bc464f68954853a4edc3cf169a5f0 (commit)
       via  ddb517d014bf2245b38a0b56c9b7e98e6aaf7988 (commit)
       via  93032953afb5bd939dceb3ce427f4b6fa50e2450 (commit)
       via  ace121534de464bc7da35694a93cfb8ccc3effb6 (commit)
       via  735a5bb321ff7b92bebe2769e98a1d6317e88d27 (commit)
       via  83b730cd1aeeafc05473d163e13fb5489817c149 (commit)
       via  126c6ead7707ac29f3b2fa779752025c7cc0da32 (commit)
       via  de91feb367c127294a56b492799c4bf042954fd8 (commit)
       via  d65689a3bd059b2f70e11644e43df4251c71987e (commit)
       via  d1c0a5fce6c9adccd1abf6b41ba448976ef895d0 (commit)
       via  a65011baf109fd0afe759cf3d9e7b6ab7013a805 (commit)
      from  50b64fb0121d8f0ce5302486276c4a3b604e42b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39f0fa725e71c62eda5a039aba2098bef348bb9b
commit 39f0fa725e71c62eda5a039aba2098bef348bb9b
Merge: 50b64fb 920a046
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Aug 25 15:40:29 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 15:40:29 2011 -0400

    Merge topic 'AutomocForQt'
    
    920a046 QtAutomoc: Eliminate compiler warning
    b00463f QtAutomoc test: Pass QT_QMAKE_EXECUTABLE
    e78ce44 Fix automoc with VS builds: apply patch from Bill
    71165e9 Silence warning in automoc: use long instead of int
    1879bcc Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out
    678e124 Only enable the automoc test after checking that Qt4 works
    71c29d1 Fix bootstrap test with automoc
    afb3edc Fix warnings
    add30e9 Fix build: non-void function must return a value
    7e6d845 Automoc.cmake is not needed anymore
    2963d0b Fix logic which decides when to execute automoc test
    77a5c6e Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC
    bf8ef77 Add a test for automoc
    d045fd4 Nicer progress message for the automoc target
    50cd6ce Move automoc processing from add_executable/library to cmGlobalGenerator
    cbaac2a Remove trailing whitespace
    c27607b Refactor SetupAutomocTarget() so it can be run after creating the target
    24d9b7d Remove trailing whitespace
    58b7fe6 Use cout instead of printf()
    72caf4d Add the generated automoc.cpp file to the cleaned files
    ddb517d Color output when running moc
    9303295 Initialize verbose based onb the env.var.
    ace1215 Move code for parsing a cpp-file from the big loop to separate function
    735a5bb Fix line lengths
    83b730c Add AUTOMOC to the add_library() command
    126c6ea Add the cmake module required currently for automoc
    de91feb Remove the need to check for .h/.cxx during buildtime
    d65689a Add actual automoc code from automoc
    d1c0a5f Start implementing skeleton for automoc in cmake
    a65011b Start work on automoc: add empty cmQtAutomoc class


-----------------------------------------------------------------------

Summary of changes:
 Modules/AutomocInfo.cmake.in              |   13 +
 Source/CMakeLists.txt                     |    2 +
 Source/cmAddExecutableCommand.cxx         |    3 +-
 Source/cmAddLibraryCommand.cxx            |   33 +-
 Source/cmDocumentVariables.cxx            |    9 +
 Source/cmGlobalGenerator.cxx              |   62 ++-
 Source/cmGlobalGenerator.h                |    2 +
 Source/cmGlobalVisualStudio7Generator.cxx |   12 -
 Source/cmGlobalVisualStudio7Generator.h   |    3 -
 Source/cmLocalVisualStudio7Generator.cxx  |   44 +-
 Source/cmLocalVisualStudio7Generator.h    |    1 -
 Source/cmMakefile.cxx                     |    3 +-
 Source/cmMakefile.h                       |    2 +-
 Source/cmQtAutomoc.cxx                    |  782 +++++++++++++++++++++++++++++
 Source/cmQtAutomoc.h                      |   66 +++
 Source/cmTarget.cxx                       |   25 +-
 Source/cmake.cxx                          |   14 +
 Source/cmake.h                            |    1 +
 Tests/CMakeLists.txt                      |   39 ++
 Tests/QtAutomoc/CMakeLists.txt            |   20 +
 Tests/QtAutomoc/calwidget.cpp             |  424 ++++++++++++++++
 Tests/QtAutomoc/calwidget.h               |  121 +++++
 Tests/QtAutomoc/codeeditor.cpp            |  153 ++++++
 Tests/QtAutomoc/codeeditor.h              |   99 ++++
 Tests/QtAutomoc/main.cpp                  |   58 +++
 25 files changed, 1917 insertions(+), 74 deletions(-)
 create mode 100644 Modules/AutomocInfo.cmake.in
 create mode 100644 Source/cmQtAutomoc.cxx
 create mode 100644 Source/cmQtAutomoc.h
 create mode 100644 Tests/QtAutomoc/CMakeLists.txt
 create mode 100644 Tests/QtAutomoc/calwidget.cpp
 create mode 100644 Tests/QtAutomoc/calwidget.h
 create mode 100644 Tests/QtAutomoc/codeeditor.cpp
 create mode 100644 Tests/QtAutomoc/codeeditor.h
 create mode 100644 Tests/QtAutomoc/main.cpp


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list