summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* VS: Prevent generated "rule" files from causing rebuildsMike Pagel2015-09-282-0/+29
| | | | | | When we generate a ".rule" file to attach a custom command in a VS IDE project, set the file timestamp to be old enough to prevent the rule from re-running due to its timestamp.
* Merge topic 'minor-cleanups'Brad King2015-09-2824-86/+5
|\ | | | | | | | | | | | | | | | | | | | | 51e48637 VS: Remove impossible condition. 203eada6 cmMakefile: Remove Configured state. 5642449a cmCommand: Remove IsDiscouraged interface. 77c6a339 cmSetCommand: Re-use local named variable. 732f5511 cmSetCommand: Fix typo in comment. 8544f16d cmGlobalGenerator: Devirtualize method. 9096daaf Ninja: Remove unused variable.
| * VS: Remove impossible condition.Stephen Kelly2015-09-271-3/+2
| |
| * cmMakefile: Remove Configured state.Stephen Kelly2015-09-272-8/+0
| | | | | | | | It is vestigial.
| * cmCommand: Remove IsDiscouraged interface.Stephen Kelly2015-09-2718-71/+0
| | | | | | | | | | This used to affect documentation, but does not affect the Sphinx documentation.
| * cmSetCommand: Re-use local named variable.Stephen Kelly2015-09-271-1/+1
| |
| * cmSetCommand: Fix typo in comment.Stephen Kelly2015-09-271-1/+1
| |
| * cmGlobalGenerator: Devirtualize method.Stephen Kelly2015-09-271-1/+1
| |
| * Ninja: Remove unused variable.Stephen Kelly2015-09-271-1/+0
| |
* | Merge topic 'update-kwsys'Brad King2015-09-282-66/+72
|\ \ | | | | | | | | | | | | | | | 946e8615 Merge branch 'upstream-kwsys' into update-kwsys 29ad0694 KWSys 2015-09-25 (dc4e4a55)
| * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-262-66/+72
| | |
* | | Merge topic 'ninja-cleanup-path-conversion'Brad King2015-09-287-48/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6e2a4087 Ninja: Centralize path conversion in global generator (#15757) 993d0641 Ninja: Fix OBJECT_DIR placeholder substitution in link rules
| * | | Ninja: Centralize path conversion in global generator (#15757)Brad King2015-09-256-47/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Ninja generator we run all build rules from the top of the build tree rather than changing into each subdirectory. Therefore we convert all paths relative to the HOME_OUTPUT directory. However, the Convert method on cmLocalGenerator restricts relative path conversions to avoid leaving the build tree with a "../" sequence. Therefore conversions performed for "subdirectories" that are outside the top of the build tree always use full paths while conversions performed for subdirectories that are inside the top of the build tree may use relative paths to refer to the same files. Since Ninja always runs rules from the top of the build tree we should convert them using only the top-level cmLocalGenerator in order to remain consistent. Also extend the test suite with a case that fails without this fix.
| * | | Ninja: Fix OBJECT_DIR placeholder substitution in link rulesBrad King2015-09-251-1/+3
| | | | | | | | | | | | | | | | | | | | Convert the OBJECT_DIR value to the shell output format so that it is properly quoted when the path contains spaces.
* | | | Merge topic 'genex-SHELL_PATH'Brad King2015-09-283-15/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ca6ba3fe Genex: Add a SHELL_PATH expression 7de868c4 Tests: Simplify GeneratorExpression check implementation
| * | | | Genex: Add a SHELL_PATH expressionStefan Kislinskiy2015-09-283-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some commands on Windows do not understand forward slash paths and require backslashes. In order to help projects generate shell invocations of such commands, provide a generator expression to convert paths to the shell-preferred path format for the current generator. This will allow custom commands to generate paths the same way CMake does for compiler command invocations.
* | | | | CMake Nightly Date StampKitware Robot2015-09-281-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-09-271-1/+1
| |_|/ |/| |
* | | Merge topic 'revert-cpack-package-empty-dirs'Brad King2015-09-263-27/+0
|\ \ \ | | | | | | | | | | | | | | | | 4fa17553 Revert topic 'cpack-package-empty-dirs'
| * | | Revert topic 'cpack-package-empty-dirs'Brad King2015-09-253-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in commit 47b060ae (CPackDeb: allow empty directories in component packages, 2015-09-21), commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-21), and commit b761e90d (CPack: remove accidental changes, 2015-09-22) regressed packaging of CMake itself. Revert the changes until they can be revised and rebased on other changes that make additional fixes.
* | | | CMake Nightly Date StampKitware Robot2015-09-261-1/+1
| | | |
* | | | Merge topic 'revert-cmake-W-options'Brad King2015-09-253-236/+39
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 2e606306 Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options 81739e92 Revert topic 'cmake-W-options' (#15747)
| * | | Merge branch 'improve-variable-help-formatting' into revert-cmake-W-optionsBrad King2015-09-22100-3361/+4805
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Help/variable/CMAKE_ERROR_DEPRECATED.rst Help/variable/CMAKE_WARN_DEPRECATED.rst by integrating changes from both sides.
| * | | | Revert topic 'cmake-W-options' (#15747)Brad King2015-09-223-236/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in commit c96fe0b4 (cmake: Add -W options to control deprecation warnings and errors, 2015-07-28) fail to account for -Wdev warnings produced by places in CMake other than message(). This causes a regression in which -Wno-dev fails to suppress such warnings. Revert the feature until it can be revised accordingly.
* | | | | Merge topic 'fix-try_compile-internal-argv'Brad King2015-09-251-5/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 710bde43 cmCoreTryCompile: Fix internal argument vector construction
| * | | | | cmCoreTryCompile: Fix internal argument vector constructionBrad King2015-09-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In TryCompileCode we construct an internal argv[] vector that needs to have a fake argv[0] so our internal cmake command line looks like a real command line. Fix construction of the fake argv[0] when try_compile is called without the CMAKE_FLAGS argument. Otherwise the first internal -DVAR=val argument that we use to pass information like CMAKE_OSX_SYSROOT is ignored.
* | | | | | Merge topic 'install-directory-dest-genex'Brad King2015-09-252-1/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd189cc2 install: Allow generator expressions in DIRECTORY DESTINATION
| * | | | | | install: Allow generator expressions in DIRECTORY DESTINATIONRobert Goulet2015-09-242-1/+57
| | | | | | |
* | | | | | | Merge topic 'fix-max-path-initialization'Brad King2015-09-256-32/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bfff686 cmLocalGenerator: Compute object max path on construction. 2c2479fb cmGlobalGenerator: Create all local generators after Configure(). 194bb068 cmGlobalGenerator: Remove unused method. c5f07e05 cmGlobalGenerator: Create local generators after all makefiles configured. dd408de4 cmGlobalGenerator: Create local generator after configuring the makefile. 8a88089b cmMakefile: Create the local generator after configuring the makefile. 934aa454 Makefiles: Remove need to create local generator at configure time. 61b48e70 Makefiles: Port to cmOutputConverter.
| * | | | | | | cmLocalGenerator: Compute object max path on construction.Stephen Kelly2015-09-243-6/+4
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create all local generators after Configure().Stephen Kelly2015-09-241-1/+1
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Remove unused method.Stephen Kelly2015-09-242-7/+0
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create local generators after all makefiles configured.Stephen Kelly2015-09-243-7/+15
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create local generator after configuring the makefile.Stephen Kelly2015-09-241-2/+2
| | | | | | | |
| * | | | | | | cmMakefile: Create the local generator after configuring the makefile.Stephen Kelly2015-09-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local generator is not used during configure time.
| * | | | | | | Makefiles: Remove need to create local generator at configure time.Stephen Kelly2015-09-241-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is used during try_compile.
| * | | | | | | Makefiles: Port to cmOutputConverter.Stephen Kelly2015-09-241-1/+2
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-09-251-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'install-files-dest-genex'Brad King2015-09-242-5/+26
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 69ab5f55 Tests: Cover install(FILES) with a genex DESTINATION 17aa6fd3 install: Allow generator expressions in FILES DESTINATION
| * | | | | | install: Allow generator expressions in FILES DESTINATIONRobert Goulet2015-09-232-5/+26
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2015-09-241-1/+1
|/ / / / /
* | | | | Merge topic 'vs-target-ordering'Brad King2015-09-237-14/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40c7b461 VS: Fix rebuild with regeneration after input CMake code change (#15754) 03bfe71a VS: Refactor target ordering logic
| * | | | | VS: Fix rebuild with regeneration after input CMake code change (#15754)Brad King2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using "cmake --build ." or "MSBuild ALL_BUILD.vcxproj" to drive the build the dependencies in the .sln file are not considered. This means that ProjectReference elements in .vcxproj files are used to order targets. We must ensure that the ZERO_CHECK target is listed as the first dependency of every target so that when it causes regeneration of the build files then MSBuild has not yet loaded the updated files.
| * | | | | VS: Refactor target ordering logicBrad King2015-09-227-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cmGlobalVisualStudioGenerator::TargetCompare to store the name of the target that should come first instead of hard-coding "ALL_BUILD". Update client sites to specify "ALL_BUILD" when ordering for .sln files and an empty string otherwise (in cases when "ALL_BUILD" should not be encountered anyway).
* | | | | | Merge topic 'cpack-package-empty-dirs'Brad King2015-09-231-1/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | | b761e90d CPack: remove accidental changes
| * | | | CPack: remove accidental changesDomen Vrankar2015-09-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Remove changes accidentally included in commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-22).
* | | | | CMake Nightly Date StampKitware Robot2015-09-231-1/+1
| | | | |
* | | | | Merge topic 'cpack-package-empty-dirs'Brad King2015-09-223-0/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | b58de9fe CPack: allow packaging of empty directories 47b060ae CPackDeb: allow empty directories in component packages
| * | | | CPack: allow packaging of empty directoriesDomen Vrankar2015-09-222-0/+26
| | | | |
| * | | | CPackDeb: allow empty directories in component packagesRaffi Enficiaud2015-09-211-0/+2
| | | | |