summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add_javascript_coverage_parser'Brad King2014-10-295-0/+258
|\ | | | | | | | | 220e8134 CTest: Add Javascript coverage parser
| * CTest: Add Javascript coverage parserJoseph Snyder2014-10-295-0/+258
| | | | | | | | | | | | | | Add a coverage parser for the Blanket.js library using the JSON output of the mocha.js test runner. Add a test for the new parser.
* | CMake Nightly Date StampKitware Robot2014-10-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-10-281-1/+1
|/
* Merge topic 'autorcc-depends'Brad King2014-10-272-24/+317
|\ | | | | | | | | | | | | 6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074) a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process. 506151af QtAutogen: Extract a GetRccExecutable method.
| * QtAutogen: Regenerate qrc files if their input changes (#15074)Stephen Kelly2014-10-242-8/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get dependencies from the output of ``rcc --list`` if using Qt 5. Otherwise process the file in the same way as the qt4_add_resources macro. This does not work for RCC files which are generated. The cmake_autogen build step is implemented as a PRE_BUILD step of the target currently if possible, rather than a standalone custom target. This is to keep the number of (synthesized) custom targets that appear in the UI low, but in some cases it is necessary to fall back to a full custom target. Fall back to a full custom target for the VS builds if autorcc is used.
| * QtAutogen: Expand rccfiles into a vector early in the autogen process.Stephen Kelly2014-10-232-7/+7
| | | | | | | | This can be re-used as a vector.
| * QtAutogen: Extract a GetRccExecutable method.Stephen Kelly2014-10-232-9/+33
| |
* | Merge topic 'revert-definition-map-lookup'Brad King2014-10-273-24/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure 5f414cef Revert "cmDefinitions: Don't store parent lookups" e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes 064c415d test: add test for PARENT_SCOPE behavior
| * | Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | | CMake Nightly Date StampKitware Robot2014-10-271-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-261-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-251-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-10-241-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2014-10-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-10-221-1/+1
| |
* | Merge topic 'remove-borland-build'Brad King2014-10-2121-122/+4
|\ \ | | | | | | | | | | | | 2db55ffa Remove borland workarounds.
| * | Remove borland workarounds.Stephen Kelly2014-10-1521-122/+4
| | | | | | | | | | | | | | | CMake 3.0 is the last release to require to be able to build with Borland.
* | | Merge topic 'remove-redundant-c_str'Brad King2014-10-2174-395/+395
|\ \ \ | | | | | | | | | | | | | | | | cc1139cc strings: Remove redundant calls to std::string::c_str()
| * | | strings: Remove redundant calls to std::string::c_str()Nils Gladitz2014-10-1574-395/+395
| | | | | | | | | | | | | | | | | | | | Replacements were detected and performed by the clang tool remove-cstr-calls on a linux build.
* | | | Merge topic 'ctest-delphi-coverage'Brad King2014-10-215-0/+339
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5c31c3e4 CTest: Add code coverage parser for Pascal/Delphi
| * | | | CTest: Add code coverage parser for Pascal/DelphiJoseph Snyder2014-10-215-0/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a class to parse the HTML output of the Delphi-code-coverage tool http://code.google.com/p/delphi-code-coverage/ Add a test for the new parser.
* | | | | CMake Nightly Date StampKitware Robot2014-10-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-191-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-181-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-171-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-161-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-10-151-1/+1
| |/ / |/| |
* | | Begin post-3.1 developmentBrad King2014-10-141-2/+2
| | |
* | | CMake 3.1.0-rc1 version updateBrad King2014-10-141-3/+3
| | |
* | | Merge topic 'fix-comment-typos'Brad King2014-10-1415-20/+20
|\ \ \ | | | | | | | | | | | | | | | | bef23e81 Fix some spelling errors in comments
| * | | Fix some spelling errors in commentsGeoff Viola2014-10-1315-20/+20
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-10-141-1/+1
| | | |
* | | | Merge topic 'fix-ninja-rc-include-flags'Brad King2014-10-135-8/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f4c5eade Ninja: Fix RC include directories regression
| * | | | Ninja: Fix RC include directories regressionBrad King2014-10-135-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit b9aa5041 (cmLocalGenerator: Simplify GetIncludeFlags output formatting, 2014-03-04) caused Windows Resource Compiler include directories to be computed as relative paths in the Ninja generator. This breaks the cmcldeps handling of include paths. The reason for the regression is that several cmLocalGenerator::GetIncludeFlags callers treated the fourth "bool forResponseFile" argument as if it controlled whether include directories were a full path. It actually did control that by accident until the above commit. Add an explicit "bool forceFullPaths" argument to GetIncludeFlags and thread the value through ConvertToIncludeReference as needed. Update GetIncludeFlags call sites that really wanted to control the forResponseFile setting to be aware of the new argument. Extend the VSResource test to cover this case.
* | | | | CMake Nightly Date StampKitware Robot2014-10-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-111-1/+1
| | | | |
* | | | | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-102-28/+80
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 631fadea Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5' 50e261dd OSX: Warn when attempting to change runtime paths on OS X 10.5 9b98fd52 cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin 83a06bb4 BundleUtilities: Framework codesign Resources/Info.plist & Current f7df82ac BundleUtilities: Resolve & replace @rpath placeholders 14bc686f GetPrerequisites: Make sure dyld placeholders are prefixes 6c313797 BundleUtilities: Use find on UNIX for fast executable lookup
| * | | | OSX: Warn when attempting to change runtime paths on OS X 10.5Clinton Stimpson2014-10-101-27/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though 10.5 supports @rpath, the support is not complete enough for CMake. For instance, install_name_tool doesn't support adding and removing rpaths. Also modifying BundleUtilities test to remove an undesirable cmake generated runtime path. The intent was to build with the install rpath as is done with the other cases in this test.
| * | | | cmake-gui: Make sure we bundle Qt5 Cocoa platform pluginAdam Strzelecki2014-10-101-1/+27
| | | | | | | | | | | | | | | | | | | | Otherwise CMake.app bundle will not run when using Qt5.
* | | | | CMake Nightly Date StampKitware Robot2014-10-101-1/+1
| | | | |
* | | | | Merge topic 'ninja-phony-rules-only-in-build-tree'Brad King2014-10-091-6/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | de8e534b Ninja: Limit custom command side-effects to build folder
| * | | | Ninja: Limit custom command side-effects to build folderBrad King2014-10-081-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 7243c951 (Ninja: Don't limit custom cmd side-effects to build folder, 2014-06-27) because it causes every custom command dependency in the source tree to get a phony rule. For large projects these rules get too big for Ninja to handle efficiently. While the original change addressed a valid concern, it did not seem to occur regularly in practice because well-behaved projects generate their side-effects only in the build tree. Until we support explicit specification of side-effects (CMake issue #14963), we will have to use this as a middle-ground.
* | | | | CMake Nightly Date StampKitware Robot2014-10-091-1/+1
| | | | |
* | | | | Merge topic 'ctest-memcheck-sanitizers'Brad King2014-10-082-18/+65
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0e75a72 Help: Add notes for topic 'ctest-memcheck-sanitizers' 7345a1f7 tests: Add a test for ctest_memcheck MemorySanitizer 0c6330da ctest_memcheck: Add support for MemorySanitizer msan 9ba8bf12 tests: add a test for ctest_memcheck UndefinedBehaviorSanitizer 816c100a ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsan b67ef537 ctest_memcheck: Order sanitizer type code consistently f48a2968 Tests: Organize CTestTestMemcheck inner test code
| * | | | ctest_memcheck: Add support for MemorySanitizer msanBill Hoffman2014-10-072-0/+23
| | | | |
| * | | | ctest_memcheck: Add support for UndefinedBehaviorSanitizer ubsanBen Boeckel2014-10-072-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | UBSan instruments a build and logs messages on any undefined behavior instances.
| * | | | ctest_memcheck: Order sanitizer type code consistentlyBrad King2014-10-072-24/+26
| | | | | | | | | | | | | | | | | | | | Use alphabetic order everywhere we enumerate the sanitizer types.