summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Empty commit at end of history preceding clang-format style transitionBrad King2016-05-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is an empty commit that precedes an automatic application of clang-format to update the C++ style of our entire source tree. This may be helpful to rebase a topic branch that was originally based on a commit preceding the transition. One may first rebase the topic on this commit. Then use one of the following approaches. * Rewrite the topic, including this commit, using `git filter-branch` `--tree-filter` with `Utilities/Scripts/clang-format.bash` to update the style in every commit. Rebase the revised topic, excluding the rewrite of this commit, on the style transition commit. OR * Add a `.git/info/grafts` entry to change the parent of the first commit in the topic from this commit to the style transition commit. Rewrite the topic using `git filter-branch --tree-filter` with `Utilities/Scripts/clang-format.bash` to update the style in every commit. Then remove the graft, which was resolved by the filter. See `git help filter-branch` and `git help repository-layout` for details.
* CONTRIBUTING: Add a section on coding styleBrad King2016-05-161-0/+10
| | | | Document that we now define our coding style with `clang-format`.
* Add a script to run clang-format on the entire source treeBrad King2016-05-161-0/+91
| | | | | | List all sources in version control and filter out those that we should not format for various reasons. Then run the clang-format tool to do an in-place update.
* Configure clang-format for CMake source treeBrad King2016-05-161-0/+9
| | | | | | | | | | | | | | | | | After discussion among developers we settled on the Mozilla style with a few tweaks: * Do not align operator arguments. * Do not always break after a function return type. * Limit to 79 columns instead of 80 to fit edge cases better in 80-column terminals as CMake has always done. * Format for C++98 instead of C++11 because CMake is written in the former language. Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Tell Git to use a distinct conflict marker size in `.rst` filesBrad King2016-05-161-0/+2
| | | | | Use a long conflict marker size that is unlikely to be in conflict with a `=======` section header underline.
* cmGeneratorTarget: Protect macro code layout from clang-formatBrad King2016-05-161-12/+12
| | | | | | | The `IMPLEMENT_VISIT_IMPL` macro must preserve a space before the `>` character in case the `DATATYPE` is a template type ending in `>`. Manually format the macro layout as clang-format would except for this space. Then add markup to tell clang-format not to format this macro.
* Merge topic 'boost-component-headers'Brad King2016-05-161-4/+84
|\ | | | | | | | | c2e8d515 FindBoost: Add checks for component-specific headers
| * FindBoost: Add checks for component-specific headersRoger Leigh2016-05-161-4/+84
| | | | | | | | | | | | | | | | | | | | This supplements the existing library checks, to cater for the possibility that the libraries are present but the headers are not. This can happen when the Boost collections is split up into multiple packages and not all are installed, and will avoid the checks silently passing when the build would subsequently fail.
* | Merge topic 'boost-1.61'Brad King2016-05-161-1/+15
|\ \ | | | | | | | | | | | | 328eff90 FindBoost: Update dependencies for Boost 1.61
| * | FindBoost: Update dependencies for Boost 1.61Roger Leigh2016-05-131-1/+15
| | |
* | | Merge topic 'findpkgconfig-target'Brad King2016-05-164-6/+108
|\ \ \ | | | | | | | | | | | | | | | | df97b979 FindPkgConfig: optionally create imported target for the found libraries
| * | | FindPkgConfig: optionally create imported target for the found librariesRolf Eike Beer2016-05-144-6/+108
| | | |
* | | | Merge topic 'cpack-rpm-adding-dist-to-release-tag'Brad King2016-05-166-3/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f5089cfc CPack/RPM adding dist to release tag test f7003a60 CPack/RPM release dist tag support
| * | | | CPack/RPM adding dist to release tag testDomen Vrankar2016-05-145-0/+28
| | | | | | | | | | | | | | | | | | | | Tests and release notes
| * | | | CPack/RPM release dist tag supportHarry Mallon2016-05-141-3/+24
| |/ / / | | | | | | | | | | | | | | | | Some Linux distros require Release tag to be set to <ReleaseVersion><Dist>.
* | | | Merge topic 'cpack-rpm-different-package-names'Brad King2016-05-169-35/+143
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 44ee2d71 CPack/RPM different package names
| * | | | CPack/RPM different package namesDomen Vrankar2016-05-159-35/+143
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Packagers may now set their own rpm package file names or request that rpmbuild tool chooses one for them. It also supports handing of situations where one spec file may produce multiple rpm packages.
* | | | Merge topic 'cpack-deb-improvements'Brad King2016-05-1631-99/+552
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4461e8bb CPack/Deb cpack-deb-improvements release notes 7e940bf7 CPack/Deb test changes due to breaking changes 3b648894 CPack/Deb package release number in file name 316dd613 CPack/Deb proper package file naming 271e03f0 CPack/Deb per-component package architecture 23baaf8d CPack/Deb inter package dependencies 3a55a0e7 CPack/Deb proper component packages file naming c7f388e7 CPack/Deb generation of postinst and postrm ldconfig files 2d589653 CPack/Deb generation of DEBIAN/shlibs control file
| * | | | CPack/Deb cpack-deb-improvements release notesDomen Vrankar2016-05-131-0/+27
| | | | |
| * | | | CPack/Deb test changes due to breaking changesDomen Vrankar2016-05-1327-29/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New CPack/Deb tests and changes to old tests as package file names and inter component dependency detection was changed.
| * | | | CPack/Deb package release number in file nameDomen Vrankar2016-05-131-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debian packages file naming format must contain revision number - package release number (breaks compatibility with previous versions)
| * | | | CPack/Deb proper package file namingDomen Vrankar2016-05-133-38/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Proper Debian packages file naming for single package setup (breaks compatibility with previous versions)
| * | | | CPack/Deb per-component package architectureAlexander Smorkalov2016-05-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowed to set per-compoment Debian package architecture. Useful, if you distribute documentation (should have "all architecture").
| * | | | CPack/Deb inter package dependenciesAlexander Smorkalov2016-05-131-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | In multi-component setup dependencies between packages are set (breaking change)
| * | | | CPack/Deb proper component packages file namingAlexander Smorkalov2016-05-132-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Proper Debian packages file naming for multi-component setup (breaks compatibility with previous versions)
| * | | | CPack/Deb generation of postinst and postrm ldconfig filesAlexander Smorkalov2016-05-132-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEBIAN/postinst and DEBAIN/postrm files generation if the package installs libraries in ldconfig controlled location (/lib/, /usr/lib/)
| * | | | CPack/Deb generation of DEBIAN/shlibs control fileAlexander Smorkalov2016-05-132-34/+143
| | | | | | | | | | | | | | | | | | | | | | | | | DEBIAN/shlibs control file generation if the package contains libraries
* | | | | Merge topic 'link-item-interface-not-path'Brad King2016-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9cb263d7 cmComputeLinkInformation: Do not mark interface library as a path
| * | | | | cmComputeLinkInformation: Do not mark interface library as a pathBrad King2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The empty string we add as a link item for an INTERFACE_LIBRARY target is not a path, so do not mark it as such. The generators currently tolerate it either way, but only by accident.
* | | | | | CMake Nightly Date StampKitware Robot2016-05-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-05-151-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2016-05-141-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'fix-hdf5-component-search'Brad King2016-05-131-78/+204
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fdfb0c06 HDF5: Rework component searching to correctly find HL for all bindings
| * | | | HDF5: Rework component searching to correctly find HL for all bindingsChuck Atkins2016-05-121-78/+204
| | | | |
* | | | | Merge topic 'InstallRequiredSystemLibraries-Windows-UCRT'Brad King2016-05-134-1/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b0b0660 InstallRequiredSystemLibraries: Optionally install Windows UCRT (#16073) bbf8c03b InstallRequiredSystemLibraries: Fix ENV{ProgramFiles(x86)} reference
| * | | | | InstallRequiredSystemLibraries: Optionally install Windows UCRT (#16073)Brad King2016-05-124-0/+31
| | | | | |
| * | | | | InstallRequiredSystemLibraries: Fix ENV{ProgramFiles(x86)} referenceBrad King2016-05-121-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.1.0-rc1~544^2~5 (Windows: Avoid () in environment variable references, 2014-05-02) introduced a set() command in the middle of an argument list. Move it to before the find_path() call.
* | | | | CMake Nightly Date StampKitware Robot2016-05-131-1/+1
|/ / / /
* | | | Merge topic 'ctest-suppress-Note'Brad King2016-05-121-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | eafe541f CTest: Do not treat "Note: ..." lines as errors (#14394)
| * | | | CTest: Do not treat "Note: ..." lines as errors (#14394)Brad King2016-05-111-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise CTest interprets the Qt5 moc tool output Note: No relevant classes found. No output generated. as a compiler error.
* | | | Merge topic 'cmake-gui-locale'Brad King2016-05-121-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cab095e1 cmake-gui: Always use "C" locale for numbers (#16099)
| * | | | cmake-gui: Always use "C" locale for numbers (#16099)Clinton Stimpson2016-05-121-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Set LC_NUMERIC = "C" at startup after Qt initializes the application because Qt may have adopted the current locale from the environment. CMake does not define behavior for non-C-locale numeric behavior.
* | | | Merge topic 'pathscale-implicit-link-info'Brad King2016-05-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 25845b10 CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100)
| * | | | CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100)Michał Górny2016-05-111-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | PathScale uses a wrapper around the linker. The "ldfe" invocation in the output is followed by a normal "ld" invocation. Exclude the former so we can reach and parse the latter correctly.
* | | | Merge topic 'clang-format-prep'Brad King2016-05-122-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 06259327 Tests: Wrap long comment lines in VSXaml test 18df6a9a Tests: Protect unicode literals from clang-format Cpp03 formatting
| * | | | Tests: Wrap long comment lines in VSXaml testBrad King2016-05-111-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Manually wrap the lines and remove literal tab characters. This avoids problems with incremental formatting by clang-format.
| * | | | Tests: Protect unicode literals from clang-format Cpp03 formattingBrad King2016-05-111-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake is written in C++98 any clang-format configuration must set `Standard` to `Cpp03` so that `A<A<int> >` is not rewritten as `A<A<int>>`. However, this will cause `U"foo"` to be rewritten as `U "foo"`. Add markup to turn clang-format off in the one place that the latter case occurs so that we do not need a separate `.clang-format` config file for it. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* | | | CMake Nightly Date StampKitware Robot2016-05-121-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2016-05-111-1/+1
| | |
* | | Merge topic 'emacs-mode-custom-tab-width'Brad King2016-05-101-1/+3
|\ \ \ | | | | | | | | | | | | | | | | f12b899f cmake-mode.el: Make cmake-tab-width a customizable variable