Commit Graph

8522 Commits

Author SHA1 Message Date
Kitware Robot
d7204e649e Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* 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.
2018-06-01 09:53:42 -04:00
Brad King
eb7ec19c1c clang-format: Add comments to suppress some formatting
Preserve manually-formatted blocks.
2018-06-01 09:52:02 -04:00
Rolf Eike Beer
6a64292fa7 FindALSA: reformat docs 2018-05-31 09:35:53 +02:00
Rolf Eike Beer
1c87844856 FindALSA: provide an imported target 2018-05-31 09:35:53 +02:00
Brad King
958191a95c Merge topic 'vs-toolset-version'
5f13168419 VS: Add option to select the version of the toolset used by VS 2017

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francisco Facioni <fran6co@gmail.com>
Merge-request: !2093
2018-05-30 10:19:21 -04:00
Basil Fierz
5f13168419 VS: Add option to select the version of the toolset used by VS 2017
Add new `version=` parameter in the toolset setting to select the
version.  Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the
version, if one is set (blank indicates default).

Fixes: #17549
2018-05-29 10:12:59 -04:00
Brad King
42752d0c11 Merge topic 'cuda-unused-placeholder'
edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2108
2018-05-29 10:02:18 -04:00
Craig Scott
4e890800eb Merge topic 'doxygen-all'
7b2f440e2b FindDoxygen: Add tests for ALL option
79b29b732c FindDoxygen: add optional ALL argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2099
2018-05-29 05:25:04 -04:00
Brad King
edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder
The `<CMAKE_CUDA_LINK_FLAGS>` placeholder in CUDA rule variables comes
from the `<CMAKE_CXX_LINK_FLAGS>` placeholder from which the CUDA rule
variables were originally derived.  It is not a public interface for
adding link flags so no projects should be using it.  It is needed for
platform information modules to specify platform-specific link flags for
the language.  None of our platform modules set it, so it is unused.

Furthermore, it is broken as currently implemented.  Some of the
contexts in which it is used need `-Xlinker` and some do not.
Therefore it is not possible to use the placeholder at all.

Simply remove it for now.  If some need for platform-specific CUDA link
flags arises a new solution will be needed.
2018-05-25 10:03:03 -04:00
Brad King
46b26b52c9 Merge topic 'FindPerl-strawberry'
b37d583d5c FindPerl: Add support for Strawberry Perl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2102
2018-05-25 09:29:12 -04:00
Brad King
266fd71654 Merge topic 'FindLua-conventional-paths'
f5d19260f9 FindLua: Search for lua.h using more conventional paths
9455512d22 FindLua: Add tests for this module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2095
2018-05-25 09:26:21 -04:00
Brad King
cf723c493e Merge topic 'FindODBC-module'
357db10bd1 FindODBC: Add module to search for ODBC library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2069
2018-05-25 09:23:52 -04:00
Alexander Grund
f5d19260f9 FindLua: Search for lua.h using more conventional paths
Do not constrain the search to `include/*`.  To provide compatibility
the foreach-loop is still used. However `include/xxx` and `xxx` is now
both searched.  This honors now e.g. CMAKE_INCLUDE_PATH.

Fixes: #17999
2018-05-24 11:20:09 -04:00
Lauri
b37d583d5c FindPerl: Add support for Strawberry Perl
Fixes: #18027
2018-05-24 09:58:27 -04:00
David Demelier
79b29b732c FindDoxygen: add optional ALL argument 2018-05-24 15:13:35 +02:00
Mateusz Loskot
357db10bd1 FindODBC: Add module to search for ODBC library
Add tests for FindODBC module.
2018-05-22 21:29:22 +02:00
Brad King
0887c993aa FindBZip2: Populate BZIP2_INCLUDE_DIRS result variable
The plural-named non-cached result variable is needed to follow our
module conventions documented in `cmake-developer(7)`.  The variable is
also used to populate our ``BZip2::BZip2`` imported target include
directories, which was broken without this variable set.

Fixes: #18013
2018-05-22 09:56:32 -04:00
Brad King
a8bf1ea5b7 FindBZip2: Format result variable docs as definition list 2018-05-22 09:55:46 -04:00
Brad King
5915c5bf55 Merge topic 'cpackrpm-fix-docs'
78f0dcdcc9 CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docs
2ae2f0ca98 CPackRPM: Minor formatting cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2070
2018-05-21 11:04:56 -04:00
Brad King
9d143ce38c Merge topic 'findqt4-extra-dirs'
c2934b025d FindQt4: New IMPORTS, PLUGINS and MKSPECS handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2060
2018-05-16 10:04:38 -04:00
Brad King
92ce7cc230 Merge topic 'fix-automoc-warnings'
9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files
800b2fcf80 Qt4Macros: Use get_property/set_property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2066
2018-05-15 10:15:14 -04:00
Matthew Woehlke
9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files
Suppress AUTOMOC and AUTOUIC on files generated by Qt4 wrapping macros;
particularly, those generated by `qt4_wrap_cpp`, `qt4_wrap_ui`, and
`qt4_add_resources`.  None of these should need AUTOMOC or AUTOUIC
treatment, and CMP0071 makes it important to mark this explicitly.
2018-05-15 09:50:22 -04:00
Matthew Woehlke
800b2fcf80 Qt4Macros: Use get_property/set_property
Replace use of old-style {get,set}_source_file_properties with newer
{get,set}_property.
2018-05-15 09:48:11 -04:00
Brad King
99e658258e Merge topic 'FindPkgConfig-LINK_LIBRARIES'
92ac721a44 FindPkgConfig: export the list of found libraries also as variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2068
2018-05-14 09:46:31 -04:00
Brad King
6e39697ad5 Merge topic 'irsl-fortran-only-linux'
05ece372a6 IRSL: Fix Intel library list for ifort-only setups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2061
2018-05-14 09:35:34 -04:00
Brad King
41653c6df6 Merge topic 'findjpeg_static_fix'
322eab0429 FindJPEG: Add 'jpeg-static' to searched names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2059
2018-05-14 09:33:06 -04:00
Brad King
a04ca510c1 Merge topic 'cpack-nuget'
f739752ad6 CPack: Add NuGet support
dd43e6fe89 Tests: Format `RunCPackVerifyResult.cmake` more consistently
43582cda57 Tests: Fix comment for finding dpkg tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1972
2018-05-14 09:32:04 -04:00
Christian Pfeiffer
c2934b025d FindQt4: New IMPORTS, PLUGINS and MKSPECS handling
Fixes: #14155
2018-05-14 13:34:59 +02:00
Craig Scott
78f0dcdcc9 CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docs 2018-05-12 11:31:25 +10:00
Craig Scott
2ae2f0ca98 CPackRPM: Minor formatting cleanup 2018-05-12 11:31:25 +10:00
Rolf Eike Beer
92ac721a44 FindPkgConfig: export the list of found libraries also as variable 2018-05-11 19:35:53 +02:00
Michael Hofmann
322eab0429 FindJPEG: Add 'jpeg-static' to searched names
A statically built libjpeg-turbo library will have a '-static' suffix;
see the jpeg-static CMake target here:

    https://github.com/libjpeg-turbo/libjpeg-turbo/blob/1.5.3/CMakeLists.txt#L936

On Windows the resulting .lib file is called 'jpeg-static.lib'.
Consider this name while searching.
2018-05-11 09:57:52 -04:00
Brad King
72e9fcdf2f Merge branch 'irsl-fortran-only-linux' into release-3.11
Merge-request: !2061
2018-05-11 09:45:59 -04:00
Christian Pfeiffer
05ece372a6 IRSL: Fix Intel library list for ifort-only setups
Fixes: #17727
2018-05-11 09:45:07 -04:00
Alex Turbov
f739752ad6 CPack: Add NuGet support
Create a CPack generator that uses `nuget.exe` to create packages:

    https://docs.microsoft.com/en-us/nuget/what-is-nuget

NuGet packages could be easily produced from a `*.nuspec` file (running
`nuget pack` in the directory w/ the spec file).  The spec filename does
not affect the result `*.nupkg` name -- only `id` and `version` elements
of the spec are used (by NuGet).

Some implementation details:

* Minimize C++ code -- use CMake script do to the job. It just let the
  base class (`cmCPackGenerator`) to preinstall everything to a temp
  directory, render the spec file and run `nuget pack` in it, harvesting
  `*.nupkg` files...;

* Ignore package name (and use default paths) prepared by the base class
  (only `CPACK_TEMPORARY_DIRECTORY` is important) -- final package
  filename is a responsibility of NuGet, so after generation just scan the
  temp directory for the result `*.nupkg` file(s) and update
  `packageFileNames` data-member of the generator;

* The generator supports _all-in-one_ (default), _one-group-per-package_
  and _one-component-per-package_ modes.
2018-05-11 09:28:44 -04:00
Brad King
d54796cbd9 Merge topic 'FindCUDA-sccache'
53ffff2277 FindCUDA: Add support for sccache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2050
2018-05-11 09:22:01 -04:00
Brad King
c747d4ccb3 Merge topic 'FindBoost-backport-python-deps'
81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66
557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2045
2018-05-11 09:17:02 -04:00
Brad King
d44441a365 Merge topic 'doc-cpack-revise'
bfb91ff7f2 CPack: Add more markup to module documentation
5fc59ea7c8 CPack: Document `CPACK_PACKAGE_DESCRIPTION` variable
3f354d65b4 CPack: Move CPACK_BINARY_<GENNAME> with rest of docs
53ec402069 CPack: Convert documentation to long-bracket comment syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2051
2018-05-09 08:41:33 -04:00
Will Feng
53ffff2277 FindCUDA: Add support for sccache
When `CMAKE_C_COMPILER` is `sccache`, pass plain `cl` as the host
compiler to `nvcc`.  Otherwise, `nvcc` does not accept it.
2018-05-09 08:24:22 -04:00
Brad King
b28e093f6a Merge branch 'FindBoost-backport-python-deps' into release-3.11
Merge-request: !2045
2018-05-09 08:02:57 -04:00
Filip Matzner
81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66
Update `mpi_python##` and `numpy##` component dependencies to honor
python version suffixes on components named by the caller.  Although
upstream Boost did not add version suffixes prior to version 1.67, it is
commonly done by distros.  Honor suffixes specified by project code.
Projects must take responsibility for naming distro-specific component
suffixes for versions prior to 1.67.

Fixes: #17892, #17970
2018-05-09 07:57:36 -04:00
Alex Turbov
bfb91ff7f2 CPack: Add more markup to module documentation
Also indent variable docs consistently.
2018-05-08 14:01:07 -04:00
Alex Turbov
5fc59ea7c8 CPack: Document CPACK_PACKAGE_DESCRIPTION variable 2018-05-08 14:00:00 -04:00
Alex Turbov
3f354d65b4 CPack: Move CPACK_BINARY_<GENNAME> with rest of docs 2018-05-08 13:57:10 -04:00
Alex Turbov
53ec402069 CPack: Convert documentation to long-bracket comment syntax
Use `#[===...==[.rst:` comments for docs.
2018-05-08 13:53:50 -04:00
Brad King
557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block 2018-05-08 08:51:57 -04:00
Brad King
0df2e30638 Merge branch 'FindCUDA-revert-sepcomp-cublas' into release-3.11
Merge-request: !2048
2018-05-08 08:38:46 -04:00
Brad King
6a95a097d9 Merge branch 'java-new-packaging-fixes' into release-3.11
Merge-request: !2042
2018-05-08 08:38:25 -04:00
Brad King
e16a04ce2e Merge topic 'pkgconf-imp-target-lib-path'
ac5731a7e3 FindPkgConfig: correct library search path for imported targets.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2027
2018-05-08 08:37:35 -04:00
Brad King
6ab7267d2a Merge topic 'FindCUDA-revert-sepcomp-cublas'
9a66345752 FindCUDA: Fix regression in separable compilation without cublas

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2048
2018-05-08 08:26:46 -04:00