summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use enums defined in cmOutputConverter using their fully qualified name.Daniel Pfeifer2016-05-2525-302/+339
| | | | | | | | | Mostly automated: values=("RelativeRoot" "NONE" "FULL" "HOME" "START" "HOME_OUTPUT" "START_OUTPUT" "OutputFormat" "UNCHANGED" "MAKERULE" "SHELL" "WATCOMQUOTE" "RESPONSE" "FortranFormat" "FortranFormatNone" "FortranFormatFixed" "FortranFormatFree") for i in "${values[@]}"; do git grep -l cmLocalGenerator::$i | xargs sed -i "s|cmLocalGenerator::$i|cmOutputConverter::$i|g"; done
* 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)
| * | file: Sort GLOB results to make it deterministic (#14491)Reiner Herrmann2016-05-175-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the `file(GLOB)` documentation specifically warns against using it to collect a list of source files, projects often do it anyway. Since it uses `readdir()`, the list of files will be unsorted. This list is often passed directly to add_executable / add_library. Linking binaries with an unsorted list will make it unreproducible, which means that the produced binary will differ depending on the unpredictable `readdir()` order. To solve those reproducibility issues in a lot of programs (which don't explicitly `list(SORT)` the list manually), sort the resulting list of the `file(GLOB)` command. A more detailed rationale about reproducible builds is available [here](https://reproducible-builds.org/).
* | | Merge topic 'ghs-shorter-object-names'Brad King2016-05-187-15/+28
|\ \ \ | | | | | | | | | | | | | | | | d7233a04 GHS: Use shorter object file names on collision
| * | | GHS: Use shorter object file names on collisionGeoff Viola2016-05-187-15/+28
| | |/ | |/|
* | | Merge topic 'platform-required-rpath-override'Brad King2016-05-182-2/+6
|\ \ \ | | | | | | | | | | | | | | | | 5a21557b AIX,HP: Allow user to override the default runtime path (libpath)
| * | | AIX,HP: Allow user to override the default runtime path (libpath)Matthew Hanna2016-05-172-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH` is used by CMake to always append `-Wl,-blibpath:/usr/lib:/lib` to the link line. This is needed by default on these platforms but needs to be overridden in some use cases (e.g. an environment in which one maintains versioned shared libraries). Change our logic to set this value only if it not already set by the user, project, or toolchain file.
* | | Merge topic 'clang-format-lexer'Brad King2016-05-183-1156/+1140
|\ \ \ | | | | | | | | | | | | | | | | | | | | 030556b7 cmListFileLexer: Revise C++ coding style using clang-format e4a92dab cmListFileLexer: Update to flex 2.6
| * | | cmListFileLexer: Revise C++ coding style using clang-formatBrad King2016-05-172-329/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually extract the C++ portion of `cmListFileLexer.in.l` into a temporary file, format it, and then move it back into the original file. Manually format C++ code inside the lexer actions to match our style. Then re-generate the lexer.
| * | | cmListFileLexer: Update to flex 2.6Brad King2016-05-173-854/+926
| |/ / | | | | | | | | | | | | | | | Revise the documented modifications we need to make to the flex-generated source file according to the needs of the new version. Update our own implementation to avoid warnings with flex types.
* | | CMake Nightly Date StampKitware Robot2016-05-181-1/+1
|/ /
* | Merge topic 'clang-format-source'Brad King2016-05-171454-83577/+62365
|\ \ | |/ | | | | | | | | | | | | | | | | d9fd2f54 Revise C++ coding style using clang-format 82df6dea Empty commit at end of history preceding clang-format style transition 6a13f43f CONTRIBUTING: Add a section on coding style bf451d9f Add a script to run clang-format on the entire source tree 1e90d78f Configure clang-format for CMake source tree da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files
| * Revise C++ coding style using clang-formatKitware Robot2016-05-161450-83577/+62253
| | | | | | | | | | | | | | | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.