summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-10-319-135/+250
|
* Merge topic 'VERSION_no_sscanf'Brad King2014-10-311-13/+21
|\ | | | | | | | | | | ef09df64 cmSystemTools: reimplement verson comparison without sscanf() 667560c8 extend the testing for version comparison
| * cmSystemTools: reimplement verson comparison without sscanf()Rolf Eike Beer2014-10-311-13/+21
| | | | | | | | | | This now has the advantage that it works with version strings with any number of components.
* | Merge topic 'xcode-inherit-warning-flags'Brad King2014-10-311-0/+1
|\ \ | | | | | | | | | | | | 820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
| * | Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)Brad King2014-10-311-0/+1
| | | | | | | | | | | | | | | Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their own warning flags and have them used by the targets.
* | | CMake Nightly Date StampKitware Robot2014-10-311-1/+1
| | |
* | | Merge topic 'unix-icon-install'Brad King2014-10-302-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | fb13502f QtDialog: install the 128x128 icon fcb4541a QtDialog: don't install desktop file bits on Apple
| * | | QtDialog: install the 128x128 iconBen Boeckel2014-10-292-2/+8
| | | | | | | | | | | | | | | | Also only install the icons to the icons directory.
| * | | QtDialog: don't install desktop file bits on AppleBen Boeckel2014-10-291-1/+1
| | | | | | | | | | | | | | | | Apple uses the dmg file which doesn't have .desktop support.
* | | | Merge topic 'cpack-bundle-codesign'Brad King2014-10-302-1/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bd3fbf36 CPack: Add support for code signing of bundles on MacOS
| * | | | CPack: Add support for code signing of bundles on MacOSAndré Klitzing2014-10-282-1/+127
| | | | |
* | | | | Merge topic 'fix--D-command-line-parsing'Brad King2014-10-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee7e4a0 cmCacheManager: parse -D flags more strictly 368e8de4 Tests: test -D parsing on the command line
| * | | | | cmCacheManager: parse -D flags more strictlyBen Boeckel2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of: -DCACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG:BOOL=TRUE the variable is parsed out as: CACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG because the parser allows '=' in the variable name. Disallow such a name on the command line.
* | | | | | CMake Nightly Date StampKitware Robot2014-10-301-1/+1
| |_|_|_|/ |/| | | |
* | | | | 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.
generated by cgit v0.12 at 2025-01-10 04:57:15 (GMT)