kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,698 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

31698 Commits

Author SHA1 Message Date
Brad King 1e90d78f99 Configure clang-format for CMake source tree 
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>
 2016-05-16 16:04:46 -04:00
Brad King da60adc363 Tell Git to use a distinct conflict marker size in `.rst` files 
Use a long conflict marker size that is unlikely to be in conflict
with a `=======` section header underline.
 2016-05-16 16:04:46 -04:00
Brad King c7006d2ef1 cmGeneratorTarget: Protect macro code layout from clang-format 
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.
 2016-05-16 16:04:43 -04:00
Brad King d082810949 Merge topic 'boost-component-headers' 
c2e8d515 FindBoost: Add checks for component-specific headers
 2016-05-16 10:11:43 -04:00
Brad King 1ba8067618 Merge topic 'boost-1.61' 
328eff90 FindBoost: Update dependencies for Boost 1.61
 2016-05-16 10:11:41 -04:00
Brad King 856804f9a9 Merge topic 'findpkgconfig-target' 
df97b979 FindPkgConfig: optionally create imported target for the found libraries
 2016-05-16 10:11:38 -04:00
Brad King d3db070e9e Merge topic 'cpack-rpm-adding-dist-to-release-tag' 
f5089cfc CPack/RPM adding dist to release tag test
f7003a60 CPack/RPM release dist tag support
 2016-05-16 10:11:35 -04:00
Brad King bc7598fde0 Merge topic 'cpack-rpm-different-package-names' 
44ee2d71 CPack/RPM different package names
 2016-05-16 10:11:32 -04:00
Brad King 2b25174da6 Merge topic 'cpack-deb-improvements' 
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
 2016-05-16 10:11:30 -04:00
Brad King cd1c3d80d0 Merge topic 'link-item-interface-not-path' 
9cb263d7 cmComputeLinkInformation: Do not mark interface library as a path
 2016-05-16 10:11:27 -04:00
Roger Leigh c2e8d5150e FindBoost: Add checks for component-specific headers 
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.
 2016-05-16 09:57:46 -04:00
Kitware Robot fba30b2fc7 CMake Nightly Date Stamp 2016-05-16 00:01:05 -04:00
Kitware Robot 80a2f87968 CMake Nightly Date Stamp 2016-05-15 00:01:05 -04:00
Domen Vrankar 44ee2d717a CPack/RPM different package names 
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.
 2016-05-15 03:01:34 +02:00
Domen Vrankar f5089cfccd CPack/RPM adding dist to release tag test 
Tests and release notes
 2016-05-14 20:21:32 +02:00
Harry Mallon f7003a6055 CPack/RPM release dist tag support 
Some Linux distros require Release tag
to be set to <ReleaseVersion><Dist>.
 2016-05-14 20:21:32 +02:00
Rolf Eike Beer df97b9793f FindPkgConfig: optionally create imported target for the found libraries 2016-05-14 09:31:41 +02:00
Kitware Robot b952336902 CMake Nightly Date Stamp 2016-05-14 00:01:08 -04:00
Brad King 9cb263d772 cmComputeLinkInformation: Do not mark interface library as a path 
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.
 2016-05-13 14:39:53 -04:00
Roger Leigh 328eff90eb FindBoost: Update dependencies for Boost 1.61 2016-05-13 19:39:41 +01:00
Domen Vrankar 4461e8bb55 CPack/Deb cpack-deb-improvements release notes 2016-05-13 10:46:05 -04:00
Domen Vrankar 7e940bf74a CPack/Deb test changes due to breaking changes 
New CPack/Deb tests and changes to old tests
as package file names and inter component dependency
detection was changed.
 2016-05-13 10:46:05 -04:00
Domen Vrankar 3b64889436 CPack/Deb package release number in file name 
Debian packages file naming format must contain
revision number - package release number
(breaks compatibility with previous versions)
 2016-05-13 10:46:04 -04:00
Domen Vrankar 316dd61367 CPack/Deb proper package file naming 
Proper Debian packages file naming for single package
setup (breaks compatibility with previous versions)
 2016-05-13 10:46:04 -04:00
Alexander Smorkalov 271e03f089 CPack/Deb per-component package architecture 
Allowed to set per-compoment Debian package architecture.
Useful, if you distribute documentation (should have
"all architecture").
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov 23baaf8d73 CPack/Deb inter package dependencies 
In multi-component setup dependencies
between packages are set (breaking change)
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov 3a55a0e72c CPack/Deb proper component packages file naming 
Proper Debian packages file naming for multi-component setup
(breaks compatibility with previous versions)
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov c7f388e723 CPack/Deb generation of postinst and postrm ldconfig files 
DEBIAN/postinst and DEBAIN/postrm files generation if
the package installs libraries in ldconfig controlled
location (/lib/, /usr/lib/)
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov 2d5896530b CPack/Deb generation of DEBIAN/shlibs control file 
DEBIAN/shlibs control file generation if the package
contains libraries
 2016-05-13 10:46:02 -04:00
Brad King 131c00ee7e Merge topic 'fix-hdf5-component-search' 
fdfb0c06 HDF5: Rework component searching to correctly find HL for all bindings
 2016-05-13 09:54:08 -04:00
Brad King a0e00c4b3f Merge topic 'InstallRequiredSystemLibraries-Windows-UCRT' 
6b0b0660 InstallRequiredSystemLibraries: Optionally install Windows UCRT (#16073)
bbf8c03b InstallRequiredSystemLibraries: Fix ENV{ProgramFiles(x86)} reference
 2016-05-13 09:38:29 -04:00
Kitware Robot bdc84a9def CMake Nightly Date Stamp 2016-05-13 00:01:07 -04:00
Chuck Atkins fdfb0c0649 HDF5: Rework component searching to correctly find HL for all bindings 2016-05-12 13:54:58 -04:00
Brad King 6b0b066074 InstallRequiredSystemLibraries: Optionally install Windows UCRT (#16073) 2016-05-12 11:10:23 -04:00
Brad King bbf8c03b4f InstallRequiredSystemLibraries: Fix ENV{ProgramFiles(x86)} reference 
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.
 2016-05-12 11:08:40 -04:00
Brad King cb704c0871 Merge topic 'ctest-suppress-Note' 
eafe541f CTest: Do not treat "Note: ..." lines as errors (#14394)
 2016-05-12 09:28:36 -04:00
Brad King 7057864560 Merge topic 'cmake-gui-locale' 
cab095e1 cmake-gui: Always use "C" locale for numbers (#16099)
 2016-05-12 09:28:33 -04:00
Brad King 4cc32ad538 Merge topic 'pathscale-implicit-link-info' 
25845b10 CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100)
 2016-05-12 09:28:31 -04:00
Brad King 11eba2ecd5 Merge topic 'clang-format-prep' 
06259327 Tests: Wrap long comment lines in VSXaml test
18df6a9a Tests: Protect unicode literals from clang-format Cpp03 formatting
 2016-05-12 09:28:28 -04:00
Clinton Stimpson cab095e11e cmake-gui: Always use "C" locale for numbers (#16099) 
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.
 2016-05-12 09:24:36 -04:00
Kitware Robot 27cda1390a CMake Nightly Date Stamp 2016-05-12 00:01:11 -04:00
Brad King 062593273f Tests: Wrap long comment lines in VSXaml test 
Manually wrap the lines and remove literal tab characters.  This avoids
problems with incremental formatting by clang-format.
 2016-05-11 15:16:04 -04:00
Michał Górny 25845b10d8 CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100) 
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.
 2016-05-11 15:06:59 -04:00
Brad King 18df6a9a78 Tests: Protect unicode literals from clang-format Cpp03 formatting 
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>
 2016-05-11 10:37:45 -04:00
Brad King eafe541ff6 CTest: Do not treat "Note: ..." lines as errors (#14394) 
Otherwise CTest interprets the Qt5 moc tool output

    Note: No relevant classes found. No output generated.

as a compiler error.
 2016-05-11 09:56:51 -04:00
Kitware Robot eb4f510412 CMake Nightly Date Stamp 2016-05-11 00:01:07 -04:00
Brad King b050c58e3f Merge topic 'emacs-mode-custom-tab-width' 
f12b899f cmake-mode.el: Make cmake-tab-width a customizable variable
 2016-05-10 14:40:54 -04:00
Brad King 541d20dd9f Merge topic 'find-command-prefix-from-PATH-windows-only' 
b30b32a4 Drop find_(library|file|path) prefixes from PATH on non-Windows
 2016-05-10 14:40:52 -04:00
Brad King d5e1e187c8 Merge topic 'doc-cmake-command-modes' 
3e503fe1 Help: Document `cmake --build` as a separate command mode (#16093)
d4faed2f Help: Document `cmake --find-package` as a separate command mode
 2016-05-10 14:40:50 -04:00
Brad King 1a02780483 Merge topic 'FindLua-homebrew' 
25f34dea FindLua: Add library name for Lua 5.3 on homebrew
 2016-05-10 14:40:47 -04:00