Commit Graph

8501 Commits

Author SHA1 Message Date
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
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
Brad King
14bfd267e5 Merge topic 'java-new-packaging-fixes'
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2042
2018-05-08 08:20:36 -04:00
Brad King
9a66345752 FindCUDA: Fix regression in separable compilation without cublas
Revert commit v3.11.0-rc1~274^2 (FindCUDA: Add cublas device library to
separable compilation, 2017-11-03).  It breaks targets that do not link
to cublas.  Another solution will be needed to solve the original
problem in a more compatible way.

Fixes: #17965
2018-05-07 11:30:21 -04:00
Marc Chevrier
b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup 2018-05-07 09:40:55 -04:00
Craig Scott
a01c6e9921 CPack: Fix indentation
Addresses indentation not matching guidelines, missed in !2020.
No functional changes and no changes to docs.
2018-05-05 09:48:25 +10:00
Craig Scott
7de29da7c4 Merge topic 'feature/cpack-default-package-version'
af1c48871c CPack: Use project version as default for `CPACK_PACKAGE_VERSION`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Harry Mallon <hjmallon@gmail.com>
Merge-request: !2020
2018-05-03 17:18:38 -04:00
Alex Turbov
af1c48871c CPack: Use project version as default for CPACK_PACKAGE_VERSION
* Introduce `CMAKE_PROJECT_VERSION` and the corresponsing components:
  `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR`,
  `CMAKE_PROJECT_VERSION_PATCH` and `CMAKE_PROJECT_VERSION_TWEAK`.

* `CPack` module use `CMAKE_PROJECT_VERSION_MAJOR`,
  `CMAKE_PROJECT_VERSION_MINOR` and `CMAKE_PROJECT_VERSION_PATCH`
  to initialize corresponsing CPack variables.
2018-05-03 08:26:03 +10:00
Aleksandr Mezin
ac5731a7e3 FindPkgConfig: correct library search path for imported targets.
`-L` in LDFLAGS doesn't mean that standard search paths should be
excluded. Example:

    $ pkg-config --libs libmutter-2
    -L/usr/lib/mutter -lmutter-2 -lgtk-3 -lgdk-3 -lmutter-clutter-2 -lcairo-gobject -latk-1.0 -lpangocairo-1.0 -lpango-1.0 -lfribidi -ljson-glib-1.0 -lgio-2.0 -lwayland-egl -lwayland-client -lXtst -lXi -lmutter-cogl-2 -lcairo
-lgmodule-2.0 -pthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lgbm -ldrm -lwayland-server -lEGL -lXext -lXdamage -lXfixes -lXcomposite -lXrandr -lX11

Most of these libraries are located at standard paths, not in
`/usr/lib/mutter`.

Fixes: #17954
2018-05-02 04:16:55 +06:00
Brad King
052743556b Modules: Update documented links to CMake community Wiki
The wiki has moved.  Update links to reference the new pages.
2018-04-30 15:34:50 -04:00
Brad King
f6c558e315 Merge topic 'cpack_docs_cleanup'
9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2013
2018-04-30 09:25:08 -04:00
Brad King
27279fa2db Merge topic 'java-new-packaging-version-sort'
1013560a6a FindJava, FindJNI: Ensure most recent version is searched first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2016
2018-04-30 09:20:42 -04:00
Craig Scott
9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs
This is primarily a cleanup of the cpack(1) page. The cpack.cxx file
and CPack module were also updated to make the docs relating to
the generator specification and option names consistent in all
three places.
2018-04-28 09:31:42 +10:00
Brad King
1f06c0d8a8 Merge branch 'java-new-packaging-version-sort' into release-3.11
Merge-request: !2016
2018-04-27 08:53:02 -04:00
Marc Chevrier
1013560a6a FindJava, FindJNI: Ensure most recent version is searched first 2018-04-27 08:52:22 -04:00
Brad King
b58e41ccbd Merge branch 'backport-java-new-packaging' into release-3.11
Merge-request: !2007
2018-04-25 09:42:58 -04:00
Brad King
ea54a9c666 Merge branch 'backport-java-new-packaging' into java-new-packaging
Fix conflicts by combining the changes from both sides.
2018-04-25 09:19:35 -04:00
Marc Chevrier
5482f485b8 FindJava, FindJNI, UseJava: update for version 10 support
* new version format
* new registry layout on Windows

Fixes: #17938
2018-04-25 09:18:53 -04:00
Brad King
9df096633b Merge topic 'BLAS-no-target-in-libs'
7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES
946846aaf5 FindPkgConfig: do not unset unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2006
2018-04-25 08:58:39 -04:00
Brad King
8fd76452a4 Merge topic 'testbigendian-cache-check-fix'
7b1c5f9f05 TestBigEndian: Include CheckTypeSize outside macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1999
2018-04-25 08:53:01 -04:00
Brad King
92eae6b72d Merge topic 'cuda-no-cache-host-compiler'
bff4651f2e CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2003
2018-04-25 08:51:03 -04:00
Brad King
dc3401d5b0 Merge branch 'BLAS-no-target-in-libs' into release-3.11
Merge-request: !2006
2018-04-24 13:58:11 -04:00
Rolf Eike Beer
7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES
Since commit v3.11.0-rc1~177^2 (FindBLAS: optionally query pkg-config
for a library, 2017-12-15) the `BLAS_LIBRARIES` result variable may
incorrectly contain the name of an imported target.  Instead store the
list of libraries in the variable.  Unfortunately pkg_check_modules does
not provide a way to get this so we need to use a (temporary) hack of
reading `INTERFACE_LINK_LIBRARIES` from the interface library target.

Fixes: #17934
2018-04-24 13:49:20 -04:00