summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-deb-different-package-names'Brad King2016-05-2422-30/+120
|\ | | | | | | | | adbd3985 CPack/Deb possibility to change package name
| * CPack/Deb possibility to change package nameDomen Vrankar2016-05-2322-30/+120
| | | | | | | | | | | | | | | | This patch preserves backward compatibility of deb package names with previous CMake versions but similarly to CPack/RPM allows to change package name format and supports DEB-DEFAULT setting that produces proper Debian package names.
* | Merge topic 'cpack-deb-component-depends'Brad King2016-05-244-14/+27
|\ \ | | | | | | | | | | | | 4f3b9706 CPack/Deb prevent accidental component dependencies
| * | CPack/Deb prevent accidental component dependenciesDomen Vrankar2016-05-234-14/+27
| |/ | | | | | | | | | | | | | | | | | | Prevent accidental inter component dependency setting since this is a breaking feature in situations where another CPack module is already using the feature. It should be enabled if desired since it can cause issues when upgrading only one of the components for e.g. configuration instead of all the components at once.
* | Merge topic 'ExternalProject-fix-stash-all'Brad King2016-05-241-0/+2
|\ \ | | | | | | | | | | | | 2bc981e6 ExternalProject: Fix git stash not using "--all" option
| * | ExternalProject: Fix git stash not using "--all" optionChristian Fetzer2016-05-211-0/+2
| | | | | | | | | | | | | | | | | | GIT_VERSION_STRING is unset in _ep_write_gitupdate_script(), hence git stash is not being called with the "--all" option, even if Git is new enough to support this.
* | | Merge topic 'doc-CPACK_DMG_FORMAT'Brad King2016-05-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 239367f0 CPackDMG: Document CPACK_DMG_FORMAT default
| * | | CPackDMG: Document CPACK_DMG_FORMAT defaultHarry Mallon2016-05-231-1/+1
| | |/ | |/|
* | | Merge topic 'cpackifw-updates'Brad King2016-05-243-23/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | 06ca7795 CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option 222fa595 CPackIFW: Doc decoration
| * | | CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL optionKonstantin Podsvirov2016-05-233-2/+19
| | | |
| * | | CPackIFW: Doc decorationKonstantin Podsvirov2016-05-231-21/+25
| |/ /
* | | CMake Nightly Date StampKitware Robot2016-05-241-1/+1
|/ /
* | Merge topic 'rpath-no-regex'Brad King2016-05-231-26/+22
|\ \ | | | | | | | | | | | | f4d3c44c Fix support for large RPATH updates (#16105)
| * | Fix support for large RPATH updates (#16105)Brad King2016-05-191-26/+22
| | | | | | | | | | | | | | | Avoid using a KWSys RegularExpression to search for RPATH substrings. It cannot handle large expressions.
* | | Merge topic 'make_osx_packaging_more_robust'Brad King2016-05-231-2/+17
|\ \ \ | | | | | | | | | | | | | | | | d3812437 Make packaging script wait for the disk image to be mounted.
| * | | Make packaging script wait for the disk image to be mounted.Robert Maynard2016-05-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Frequently the apple script would execute before the disk image had been fully mounted, and would fail. We now try to wait for the disk to be mounted first.
* | | | Merge topic 'clang-format-script'Brad King2016-05-231-2/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f2117e7 clang-format.bash: Limit formatting to files selected by options
| * | | | clang-format.bash: Limit formatting to files selected by optionsBrad King2016-05-201-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that our one-shot clang-format run is complete we rarely need to filter the entire tree anymore. Filter nothing if no options are given and just print the usage message. Offer options to specify selection of some set of files from Git as needed for various workflows.
* | | | | CMake Nightly Date StampKitware Robot2016-05-231-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-05-221-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-05-211-1/+1
| | | |
* | | | Merge topic 'FindCUDA-fp16'Brad King2016-05-201-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cc95001b FindCUDA: Detect and report FP16 support
| * | | | FindCUDA: Detect and report FP16 supportBoris Fomitchev2016-05-191-0/+7
| | |_|/ | |/| | | | | | | | | | Reviewed-by: James Bigler <jamesbigler@gmail.com>
* | | | Merge topic 'ExternalProject-improve-retry'Brad King2016-05-203-100/+264
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89113e12 ExternalProject: Re-implement download logic as a dedicated script e7d5e4b4 ExternalProject: Re-implement download verification as a dedicated script ebcc7027 ExternalProject: Avoid repeating download verification 33218f6a ExternalProject: Remove unused verify script logic e5409d1e ExternalProject: Remove unused 'retries' argument from verify script d610407c ExternalProject: Use uppercase placeholders for script generation
| * | | | ExternalProject: Re-implement download logic as a dedicated scriptRuslan Baratov2016-05-192-42/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the content to a `ExternalProject-download.cmake.in` file and use `configure_file` to generate the final script. Retry logic was not working before because similar script trigger FATAL_ERROR if 'file(DOWNLOAD ...)' exits with nonzero 'status_code'. FATAL_ERROR makes the whole chain of commands stop and '_ep_write_verifyfile_script' retry logic was not used in fact. Default retry number set to 5 with pauses 0, 5, 5, 15, 60 seconds. Some space left for future improvements if needed (90, 300, 1200=20min). Can be controlled by user.
| * | | | ExternalProject: Re-implement download verification as a dedicated scriptRuslan Baratov2016-05-192-25/+66
| | | | | | | | | | | | | | | | | | | | | | | | | Move the content to a `ExternalProject-verify.cmake.in` file and use `configure_file` to generate the final script.
| * | | | ExternalProject: Avoid repeating download verificationRuslan Baratov2016-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | Verify step for downloaded files will be performed in separate script.
| * | | | ExternalProject: Remove unused verify script logicRuslan Baratov2016-05-191-17/+2
| | | | | | | | | | | | | | | | | | | | The logic to re-run the download script will be moved elsewhere.
| * | | | ExternalProject: Remove unused 'retries' argument from verify scriptRuslan Baratov2016-05-191-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | There is no retries for local files and retry logic is broken for downloads. Will be implemented in '*-download.cmake' script.
| * | | | ExternalProject: Use uppercase placeholders for script generationRuslan Baratov2016-05-191-27/+27
| |/ / / | | | | | | | | | | | | Use uppercase variables for future 'configure_file' command.
* | | | Merge topic 'minor-cleanup'Brad King2016-05-201-5/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 40bee43a cmCPackDragNDropGenerator: Replace std::{ostringstream => string}
| * | | | cmCPackDragNDropGenerator: Replace std::{ostringstream => string}Brad King2016-05-171-5/+4
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2016-05-201-1/+1
| |/ / |/| |
* | | Merge topic 'ninja-output-path-prefix'Brad King2016-05-1931-32/+481
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb076692 Tests: Select RunCMake.Ninja test cases based on ninja version 8a862a4d Ninja: Support embedding of CMake as subninja project 038e7716 Ninja: Pass all build paths through a central method 7c26a6a2 Ninja: Fix path to soname-d target file ac3cdd9a Ninja: Convert object file names to ninja paths earlier d4381cb1 Ninja: Convert link library file names like all other output paths 0397c92a Ninja: Pre-compute "CMakeCache.txt" build target name 3b3ecdfa Ninja: Pre-compute "all" build target name 5ca72750 Ninja: Simplify generation of custom target logical path
| * | | Tests: Select RunCMake.Ninja test cases based on ninja versionBrad King2016-05-181-0/+20
| | | | | | | | | | | | | | | | | | | | Some test cases need features not available in Ninja < 1.6, so check the version before running them.
| * | | Ninja: Support embedding of CMake as subninja projectNicolas Despres2016-05-1728-7/+412
| | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_NINJA_OUTPUT_PATH_PREFIX` variable. When it is set, CMake generates a `build.ninja` file suitable for embedding into another ninja project potentially generated by an alien generator.
| * | | Ninja: Pass all build paths through a central methodNicolas Despres2016-05-174-9/+27
| | | | | | | | | | | | | | | | This gives us a central location to revise paths.
| * | | Ninja: Fix path to soname-d target fileNicolas Despres2016-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | In WriteLinkStatement we convert all target output paths to ninja-style paths. Add a missing conversion for the `soname` file name.
| * | | Ninja: Convert object file names to ninja paths earlierNicolas Despres2016-05-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | In WriteObjectBuildStatement we pass object file names and directories to several places that expect paths as Ninja sees them. Convert them to Ninja paths before all such uses.
| * | | Ninja: Convert link library file names like all other output pathsNicolas Despres2016-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | All paths generated on Ninja-invoked command lines should be passed through ConvertToNinjaPath. Fix ConvertToLinkReference to call this instead of partially duplicating its implementation.
| * | | Ninja: Pre-compute "CMakeCache.txt" build target nameNicolas Despres2016-05-172-2/+4
| | | |
| * | | Ninja: Pre-compute "all" build target nameNicolas Despres2016-05-172-2/+7
| | | |
| * | | Ninja: Simplify generation of custom target logical pathBrad King2016-05-171-9/+4
| |/ / | | | | | | | | | | | | | | | In `AppendTargetOutputs` we generate a logical build target name for each UTILITY command. Simplify the logic to avoid testing the result of `ConvertToNinjaPath`.
* | | Merge topic 'ExternalProject-UPDATE_COMMAND-always'Brad King2016-05-192-0/+15
|\ \ \ | | | | | | | | | | | | | | | | bdca6838 ExternalProject: Always run update step with non-empty UPDATE_COMMAND
| * | | ExternalProject: Always run update step with non-empty UPDATE_COMMANDBrad King2016-05-182-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the `update` step is to run an update on each build (subject to `UPDATE_DISCONNECTED`). This is done for version-controlled source directories. We should do it for a custom `UPDATE_COMMAND` too. In particular, when `UPDATE_DISCONNECTED` is used we expect the `skip-update` step to exist.
* | | | Merge topic 'cpack-ifw-updates'Brad King2016-05-199-91/+609
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 41199f8c CPackIFW: Add support for Promoting Updates 6ca6b0dd CPackIFW: Add more known QtIFW releases
| * | | CPackIFW: Add support for Promoting UpdatesKonstantin Podsvirov2016-05-189-91/+607
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for this feature added by QtIFW 2.0.3: http://doc.qt.io/qtinstallerframework/ifw-updates.html Add a `cpack_ifw_update_repository` command as porcelain.
| * | | CPackIFW: Add more known QtIFW releasesKonstantin Podsvirov2016-05-181-0/+2
| |/ /
* | | CMake Nightly Date StampKitware Robot2016-05-191-1/+1
|/ /
* | Merge topic 'file-glob-sort'Brad King2016-05-185-11/+4
|\ \ | | | | | | | | | | | | edcccde7 file: Sort GLOB results to make it deterministic (#14491)