summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-asm-listing-location'Brad King2013-05-212-4/+7
|\ | | | | | | | | 7e0c45e VS: Allow /Fa to set AssemblerListingLocation (#14153)
| * VS: Allow /Fa to set AssemblerListingLocation (#14153)Brad King2013-05-202-4/+7
| | | | | | | | | | | | | | | | | | | | Generate the default AssemblerListingLocation through the flag map so that it can be overridden by a user /Fa flag. Also teach the VS 7-9 generators to map /Fa to AssemblerListingLocation. While at it, fix the AssemblerListingLocation default value to have a trailing slash after the configuration name. This ensures it will be treated as a directory and not a file name.
* | Merge topic 'fix-style'Brad King2013-05-213-4/+4
|\ \ | | | | | | | | | | | | | | | 3c7c332 Fix brace indentation. c70b9b5 Fix style.
| * | Fix brace indentation.Stephen Kelly2013-05-181-2/+2
| | |
| * | Fix style.Stephen Kelly2013-05-162-2/+2
| | |
* | | Merge topic 'implicit-link-sanitize-regex'Brad King2013-05-212-0/+2
|\ \ \ | | | | | | | | | | | | | | | | ffda082 Sanitize linker name to parse implicit link line (#14154)
| * | | Sanitize linker name to parse implicit link line (#14154)Brad King2013-05-172-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | Teach CMakeParseImplicitLinkInfo to convert the CMAKE_LINKER file name to a regular expression that matches only the original name. Escape special characters like '+' so they are not treated as regex syntax. Extend the ImplicitLinkInfoTest to test handling of a CMAKE_LINKER value with many special characters.
* | | Merge topic 'error-on-exported-missing-include-dir'Brad King2013-05-218-3/+69
|\ \ \ | | | | | | | | | | | | | | | | eabefa8 Error on relative path in INCLUDE_DIRECTORIES target property.
| * | | Error on relative path in INCLUDE_DIRECTORIES target property.Stephen Kelly2013-05-218-3/+69
| | |/ | |/| | | | | | | | | | Add policy CMP0021 to preserve existing behavior in projects expecting it from earlier CMake versions.
* | | Merge topic 'fix-build-without-qt4-with-qt5'Brad King2013-05-211-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
| * | | FindQt4: Fix QUIET failure with Qt 5 but not Qt 4Stephen Kelly2013-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call find_package(Qt4 QUIET) should be non-FATAL in that case. This fixes #14142.
* | | | Merge topic 'shared-libs-with-number-suffix'Brad King2013-05-212-5/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 342fc04 Recognize shared library files with a numerical suffix
| * | | | Recognize shared library files with a numerical suffixStephen Kelly2013-05-212-5/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | When processing link line entries we check for matches with known naming patterns for static and shared libraries. Teach this logic to recognize numerical suffixes after shared library names such as "libfoo.so.1".
* | | | Merge topic 'cmake-help-generators-fix'Brad King2013-05-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dea4d26 Docs: cmake -G selects a "build system" generator
| * | | | Docs: cmake -G selects a "build system" generatorStephen Kelly2013-05-211-2/+2
| |/ / / | | | | | | | | | | | | -G is not only for makefile generators.
* | | | Merge topic 'fix-sublime-source-flags'Brad King2013-05-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8e94767 Sublime: Honor source-level COMPILE_FLAGS property
| * | | | Sublime: Honor source-level COMPILE_FLAGS propertyStephen Kelly2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Make the code match the comment.
* | | | | Merge topic 'vs-windows-forms'Brad King2013-05-2111-3/+275
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 79ec786 VS: Add Windows Forms Support
| * | | | | VS: Add Windows Forms SupportJohn Farrier2013-05-1611-3/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to maintain designer functionality for Visual Studio C++ Windows Forms projects. Also add a test project showing how to use the CMakeLists.txt file and, when successfully configured, will allow use of the designer for the included form.
* | | | | | Merge topic 'test-moc-with-empty-COMPILE_DEFINITIONS'Brad King2013-05-213-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c0f2a1 Test the use of target transitive compile definitions with moc.
| * | | | | | Test the use of target transitive compile definitions with moc.Stephen Kelly2013-05-153-0/+47
| | | | | | |
* | | | | | | Merge topic 'Automoc-Qt4-Qt5'Brad King2013-05-215-15/+55
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6489015 Remove an endif() followed by an if() for the same condition. e7813b1 Add a test for Qt5Automoc 27fb96b Make the QtAutomoc test compile with either Qt 4 or Qt 5
| * | | | | | Remove an endif() followed by an if() for the same condition.Stephen Kelly2013-03-161-2/+1
| | | | | | |
| * | | | | | Add a test for Qt5AutomocStephen Kelly2013-03-163-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The same source is used as for the Qt4Automoc test.
| * | | | | | Make the QtAutomoc test compile with either Qt 4 or Qt 5Stephen Kelly2013-03-162-6/+13
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-211-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-201-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-191-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-181-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-05-171-1/+1
| | | | | |
* | | | | | Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS'Brad King2013-05-161-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33ed186 automoc: Read target defines unconditionally
| * | | | | | automoc: Read target defines unconditionallyStephen Kelly2013-05-161-7/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 429e3699 (Process COMPILE_DEFINITIONS as generator expressions in QtAutomoc., 2013-01-25) introduced a check for the existence of the COMPILE_DEFINITIONS property on the target before processing it. At the time, compile definitions from linked targets were added to the COMPILE_DEFINITIONS property by target_link_libraries. The way such transitive compile definitions worked was changed in subsequent commit a1c4905f (Use the link information as a source of compile definitions and includes., 2013-02-12), so that the COMPILE_DEFINITIONS property may be empty, despite the fact that there are definitions which should be used.
* | | | | | Merge topic 'CTest-less-cd'Brad King2013-05-161-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9969bfb CTest: avoid useless changing of directory
| * | | | | | CTest: avoid useless changing of directoryRolf Eike Beer2013-05-151-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point we do not care what the current directory is, as nothing that requires a specific directory is done. Just make sure that at the end we are back in the same directory as at the start.
* | | | | | Merge topic 'cpack-reg-key-doc'Brad King2013-05-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fde03c Improve documentation for CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
| * | | | | | Improve documentation for CPACK_PACKAGE_INSTALL_REGISTRY_KEY.Clinton Stimpson2013-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue 13787.
* | | | | | | Merge topic 'vs-configurations'Brad King2013-05-163-5/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42bb42d VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generators
| * | | | | | | VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generatorsBrad King2013-05-133-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize the CMAKE_CONFIGURATION_TYPES cache entry early during EnableLanguage like the Xcode generator does. Avoid depending on the MSVC compiler information module to do it. Otherwise code like project(MyProj NONE) sets CMAKE_CONFIGURATION_TYPES late (in GenerateConfigurations), and to only "Debug" and "Release" instead of the standard set of 4. Reported-by: Paul Smith <paul@mad-scientist.net>
* | | | | | | | Merge topic 'MemChecker-improvements'Brad King2013-05-1637-385/+236
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10bc50e Tests: ignore Guard Malloc messages in MemChecker tests 159c3e9 Tests: add a test with custom options passed to valgrind 61ddb93 CTest: fix comment documenting cmBoundsCheckerParser class cbdfcb0 Tests: add test for non-existent Valgrind suppression file 3b5b758 CTest: drop suppression for gcc 2.9.6 errors from default Valgrind flags 7752253 Tests: verify that memory checker output files are always present abf1df4 Tests: remove code duplication in CTestTestMemCheck tests f499422 CTest: remove unreachable code and CTestTestMemcheckUnknown test dde6306 CTest: use an output file for Valgrind (#14110) bcc0f3f Tests: create output files for all memory checkers
| * | | | | | | | Tests: ignore Guard Malloc messages in MemChecker testsRolf Eike Beer2013-05-141-1/+7
| | | | | | | | |
| * | | | | | | | Tests: add a test with custom options passed to valgrindRolf Eike Beer2013-05-092-0/+15
| | | | | | | | |
| * | | | | | | | CTest: fix comment documenting cmBoundsCheckerParser classRolf Eike Beer2013-05-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was obviously copied from Source/cmGlobalXCodeGenerator.cxx during implementation but the comment was forgotten.
| * | | | | | | | Tests: add test for non-existent Valgrind suppression fileRolf Eike Beer2013-05-091-1/+7
| | | | | | | | |
| * | | | | | | | CTest: drop suppression for gcc 2.9.6 errors from default Valgrind flagsRolf Eike Beer2013-05-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --workaround-gcc296-bugs has been part of the default Valgrind flags since Valgrind support was added in commit 5b232ded151fc22144978b74cdaf7031d466e527 (ENH: Add initial memory check support which works for Valgrind, 2003-12-15). The Valgrind manpage says that this option should be avoided if not really needed as it may cause real errors to get ignored. If someone uses a compiler that really needs the flag this flag should be set by the user explicitely. Most users will never set any flags and probably never notice that they use a flag they shouldn't.
| * | | | | | | | Tests: verify that memory checker output files are always presentRolf Eike Beer2013-05-092-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All supported memory checkers now write their output to a file. Use a dummy checker that ignores the given filename and ensure that the missing file is reported as error.
| * | | | | | | | Tests: remove code duplication in CTestTestMemCheck testsRolf Eike Beer2013-05-0929-319/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for the tests is basically the same for all those subtests, so have one template and configure that for as many tests as possible to make it easier maintainable.
| * | | | | | | | CTest: remove unreachable code and CTestTestMemcheckUnknown testRolf Eike Beer2013-05-095-43/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory checker command can't be quoted at this point, because previously it has been tested that the given file exists, which will fail if the name is quoted. The CTestTestMemcheckUnknown test aimed to test this case, has always failed to do so and serves no useful purpose therefore.
| * | | | | | | | CTest: use an output file for Valgrind (#14110)Rolf Eike Beer2013-05-093-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure Valgrind output will not screw up tests that match on the output.
| * | | | | | | | Tests: create output files for all memory checkersRolf Eike Beer2013-05-092-14/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dummy memory tester implementation now understands the command line switches for all memory checkers to redirect the output to a file. This avoids triggering the error cases for BoundsChecker and Purify because the output file does not exist.
* | | | | | | | | Merge topic 'only-first-output-regex'Brad King2013-05-161-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12cf7bc CTest: break after first regex match on output