summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* automoc: add a StrictParseCppFile(), which is only qmake-compatibleAlex Neundorf2011-12-022-6/+125
| | | | | | | | ParseCppFile() is the one which is automoc4/KDE4-compatible, and which becomes a bit crowded. By separating these two it is easier to ensure that the strict one doesn't get broken accidentially. Alex
* automoc: move the code for finding headers into separate functionAlex Neundorf2011-12-022-21/+37
| | | | Alex
* automoc: fix handling of included _p.moc filesAlex Neundorf2011-11-301-2/+3
| | | | Alex
* automoc: some more linebreaks for the warnings for better readabilityAlex Neundorf2011-11-291-8/+8
| | | | Alex
* automoc: add extra check whether the header contains Q_PRIVATE_SLOTAlex Neundorf2011-11-291-1/+50
| | | | | | | | | | | This is again for KDE4 compatiblity. If foo.moc is included, in general moc should run on foo.cpp. Usually this can't cause problems. It can only cause problems if moc must run on the header, and the resulting file must be included in the cpp file, which is the case with the Q_PRIVATE_SLOT macro. This makes the test added by Stephen pass. Alex
* Add a test case for the use of Q_PRIVATE_SLOT.Stephen Kelly2011-11-223-1/+42
|
* automoc: add special handling for including basename_p.moc, with testAlex Neundorf2011-11-226-8/+124
| | | | Alex
* automoc: move some code from the big parsing loop into separate functionsAlex Neundorf2011-11-221-30/+47
| | | | Alex
* automoc: add test for including a moc_abc_p.cpp fileAlex Neundorf2011-11-222-0/+34
| | | | Alex
* automoc: add test for including the moc file from another headerAlex Neundorf2011-11-225-1/+65
| | | | | | | including moc_xyz.cpp in abc.cpp should run moc on xyz.h (and include the file in abc.cpp) Alex
* automoc: add a test for including both abc.moc and moc_abc.cppAlex Neundorf2011-11-224-1/+74
| | | | Alex
* Automoc: modified handling of included .moc filesAlex Neundorf2011-11-161-3/+14
| | | | | | | | -enable the KDE4-compatiblity mode only when using Qt4 -always (except in the KDE4 compat mode) error out if a cpp-file contains "Q_OBJECT", but does not include filename.moc Alex
* automoc: another runtime optimizationAlex Neundorf2011-11-101-6/+23
| | | | | | | before doing the full regexp, try a simple strstr(), if this already fails, no need to do the regexp matching. Alex
* automoc: minor optimizationAlex Neundorf2011-11-101-1/+1
| | | | | | | | Handing th std::string instead the char* to the find() reduces the time from 17 to 15 seconds (for a 1000 times loop of a relatively small file), which is around 10 percent. Alex
* automoc: improved diagnosticsAlex Neundorf2011-11-101-10/+11
| | | | | | | Error/warning messages now look like: AUTOMOC: (error|warning): <filename>: the actual text... Alex
* automoc: add more test casesAlex Neundorf2011-11-106-1/+131
| | | | Alex
* automoc: handle the case when the developer includes the wrong mocfileAlex Neundorf2011-11-101-0/+33
| | | | | | | | | | There are multiple/many places in KDE where the developer includes moc_foo.cpp, and expects moc to run on foo.cpp, instead of foo.h. He should use foo.moc, but right now this is handled by automoc4, so we must stay compatible. So support this too, but warn about it. Alex
* automoc: rework the checking for the matching header, to give better warningsAlex Neundorf2011-11-101-42/+35
| | | | Alex
* automoc: stricter checking for what file is includedAlex Neundorf2011-11-101-0/+12
| | | | | | foo.cpp must include foo.moc to have itself processed by moc Alex
* KWSys Nightly Date StampKWSys Robot2011-11-061-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-11-051-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-11-041-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-11-031-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-11-021-1/+1
|
* Merge topic 'qt4-deploy-module'David Cole2011-11-011-7/+8
|\ | | | | | | | | | | | | 467ee36 Check plugin variables are defined before warning. 4571ea6 Don't resolve directories; are never relative. 9cfc920 Match fixup_qt4_executable with documentation.
| * Check plugin variables are defined before warning.Mike McQuaid2011-11-011-3/+5
| |
| * Don't resolve directories; are never relative.Mike McQuaid2011-11-011-2/+0
| |
| * Match fixup_qt4_executable with documentation.Mike McQuaid2011-11-011-2/+3
| |
* | Merge topic 'FixCMAKE_BUILD_TOOL_doc'David Cole2011-11-011-1/+1
|\ \ | | | | | | | | | | | | 83b13a2 Fix old reference to CMAKE_MAKE_PROGRAM inside CMAKE_BUILD_TOOL doc.
| * | Fix old reference to CMAKE_MAKE_PROGRAM inside CMAKE_BUILD_TOOL doc.Eric NOULARD2011-10-301-1/+1
| | |
* | | Merge topic 'CPackRPM-perComponentHeader'David Cole2011-11-013-6/+35
|\ \ \ | | | | | | | | | | | | | | | | e20c59a CPackRPM support component specific variables for spec files
| * | | CPackRPM support component specific variables for spec filesEric NOULARD2011-10-303-6/+35
| | | | | | | | | | | | | | | | | | | | This is a modified version of a user patch Inspired-By: informant
* | | | Merge topic 'doc-link_directories-misconception'David Cole2011-11-011-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 30e4a52 Tell people that link_directories() is not what they are searching for
| * | | | Tell people that link_directories() is not what they are searching forRolf Eike Beer2011-10-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Judging from the questions I see on the #cmake IRC channel this is one of the most common pitfalls for people coming from other build systems, especially plain Makefiles. Finally put this into the documentation to stop people getting fooled into using this. Text by Brad King.
* | | | | Merge topic 'fix-12539-ctestconfig-from-build-dir'David Cole2011-11-016-6/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 76ecdd8 CTest: Look for CTestConfig.cmake in build dir first, then source dir
| * | | | | CTest: Look for CTestConfig.cmake in build dir first, then source dirJean-Christophe Fillion-Robin2011-10-276-6/+99
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the ability to configure CTest with settings different from the ones available in the source tree by checking first if CTestConfig.cmake exists in the build tree. The motivation is to allow build system checking out external project to test and/or package them and submit the associated results to a different dashboard than the one specified (or not) in the source of the external project. For example, the build system of Slicer can checkout, build, test and package what I will call "extensions". These extensions can be developed by third parties who can test and submit to their own dashboard / project. When checked out by Slicer build system, the default dashboard can now be overwritten by adding a custom CTestConfig.cmake to the build directory. And if not overwritten, it would avoid to create CTestConfig.cmake within the source checkout of the extension.
* | | | | Merge topic 'fix-12383-clear-ctest-vecs'David Cole2011-11-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 499c104 CTest: Clear custom vectors before populating (#12383)
| * | | | | CTest: Clear custom vectors before populating (#12383)David Cole2011-10-261-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Important when calling ctest commands in a loop from a script. Each time Populate gets called, it uses the current definition of the variable. Without the clear, it was accumulating additional identical values each time through the loop.
* | | | | Merge topic 'FindLibXsltImprovements'David Cole2011-11-011-4/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fe6d9c1 FindLibXslt: also search libexslt and xsltproc
| * | | | | FindLibXslt: also search libexslt and xsltprocAlex Neundorf2011-10-251-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merging some changes FindLibXslt.cmake from KDE Alex
* | | | | | Merge topic 'ctest-memcheck-log-newline-issue-12538'David Cole2011-11-011-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 26b6794 Source/cmCTest.cxx: Add missing newline (#12538)
| * | | | | Source/cmCTest.cxx: Add missing newline (#12538)Bernhard Walle2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the log entry, the newline is missing. The output without the newline character is a bit strange, like SetCTestConfigurationFromCMakeVariable:MemoryCheckCommand:CTEST_MEMORYCHECK_COMMANDSetCTestConfiguration:MemoryCheckCommand:/usr/bin/valgrind Instead of SetCTestConfigurationFromCMakeVariable:MemoryCheckCommand:CTEST_MEMORYCHECK_COMMAND SetCTestConfiguration:MemoryCheckCommand:/usr/bin/valgrind This patch changes this to add a newline. Signed-off-by: Bernhard Walle <walle@corscience.de>
* | | | | | KWSys: Address Intel compiler remarksBrad King2011-11-013-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CommandLineArguments.cxx: remark #181: argument is incompatible with corresponding format string conversion SystemInformation.cxx: remark #193: zero used for undefined preprocessing identifier "_WIN32" warning #177: variable "Regebx" was declared but never referenced SystemTools.cxx(375): remark #444: destructor for base class "std::vector<char*>" is not virtual class kwsysDeletingCharVector : private kwsys_stl::vector<char*> Author: Hans Johnson <hans-johnson@uiowa.edu> Change-Id: Ibc899c3ba14990158ef7bbabace4b435b22495c3
* | | | | | KWSys Nightly Date StampKWSys Robot2011-11-011-2/+2
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-10-311-1/+1
| |_|_|_|/ |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-10-301-1/+1
| |_|_|/ |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2011-10-291-1/+1
| | | |
* | | | KWSys Nightly Date StampKWSys Robot2011-10-281-1/+1
| | | |
* | | | KWSys Nightly Date StampKWSys Robot2011-10-271-1/+1
| |_|/ |/| |
* | | KWSys Nightly Date StampKWSys Robot2011-10-261-1/+1
| |/ |/|