summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-142-21/+29
|\ | | | | | | | | | | | | 92ac721a44 FindPkgConfig: export the list of found libraries also as variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2068
| * FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-112-21/+29
| |
* | Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ \ | | | | | | | | | | | | | | | | | | 05ece372a6 IRSL: Fix Intel library list for ifort-only setups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2061
| * | IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | | | | | | | | | | | Fixes: #17727
* | | Merge topic 'findjpeg_static_fix'Brad King2018-05-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 322eab0429 FindJPEG: Add 'jpeg-static' to searched names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2059
| * | | FindJPEG: Add 'jpeg-static' to searched namesMichael Hofmann2018-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'cpack-nuget'Brad King2018-05-143-4/+587
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack: Add NuGet supportAlex Turbov2018-05-113-4/+587
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'FindCUDA-sccache'Brad King2018-05-111-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 53ffff2277 FindCUDA: Add support for sccache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2050
| * | | FindCUDA: Add support for sccacheWill Feng2018-05-091-4/+4
| | | | | | | | | | | | | | | | | | | | When `CMAKE_C_COMPILER` is `sccache`, pass plain `cl` as the host compiler to `nvcc`. Otherwise, `nvcc` does not accept it.
* | | | Merge topic 'FindBoost-backport-python-deps'Brad King2018-05-111-34/+34
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindBoost: Backport versioned python dependencies for v1.35 to v1.66Filip Matzner2018-05-091-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindBoost: Remove extra indentation in 1.65/1.66 dependency blockBrad King2018-05-081-16/+16
| | |/ | |/|
* | | Merge topic 'doc-cpack-revise'Brad King2018-05-091-330/+339
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack: Add more markup to module documentationAlex Turbov2018-05-081-174/+174
| | | | | | | | | | | | | | | | Also indent variable docs consistently.
| * | | CPack: Document `CPACK_PACKAGE_DESCRIPTION` variableAlex Turbov2018-05-081-3/+11
| | | |
| * | | CPack: Move CPACK_BINARY_<GENNAME> with rest of docsAlex Turbov2018-05-081-10/+10
| | | |
| * | | CPack: Convert documentation to long-bracket comment syntaxAlex Turbov2018-05-081-320/+321
| | |/ | |/| | | | | | | Use `#[===...==[.rst:` comments for docs.
* | | Merge topic 'pkgconf-imp-target-lib-path'Brad King2018-05-081-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ac5731a7e3 FindPkgConfig: correct library search path for imported targets. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2027
| * | | FindPkgConfig: correct library search path for imported targets.Aleksandr Mezin2018-05-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `-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
* | | | Merge topic 'FindCUDA-revert-sepcomp-cublas'Brad King2018-05-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a66345752 FindCUDA: Fix regression in separable compilation without cublas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2048
| * | | | FindCUDA: Fix regression in separable compilation without cublasBrad King2018-05-071-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'java-new-packaging-fixes'Brad King2018-05-082-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | b4e1569315 FindJava, FindJNI: fix erroneous regex, enhance registry lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2042
| * | | FindJava, FindJNI: fix erroneous regex, enhance registry lookupMarc Chevrier2018-05-072-3/+3
| | | |
* | | | CPack: Fix indentationCraig Scott2018-05-041-17/+17
| | | | | | | | | | | | | | | | Addresses indentation not matching guidelines, missed in !2020. No functional changes and no changes to docs.
* | | | Merge topic 'feature/cpack-default-package-version'Craig Scott2018-05-031-8/+45
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack: Use project version as default for `CPACK_PACKAGE_VERSION`Alex Turbov2018-05-021-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | | Modules: Update documented links to CMake community WikiBrad King2018-04-303-6/+6
| | | | | | | | | | | | | | | | The wiki has moved. Update links to reference the new pages.
* | | | Merge topic 'cpack_docs_cleanup'Brad King2018-04-301-8/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2013
| * | | | Help: Improve accuracy, readability and cross-referencing of cpack docsCraig Scott2018-04-271-8/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'java-new-packaging-version-sort'Brad King2018-04-302-7/+31
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | 1013560a6a FindJava, FindJNI: Ensure most recent version is searched first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2016
| * | FindJava, FindJNI: Ensure most recent version is searched firstMarc Chevrier2018-04-272-7/+31
| | |
* | | Merge branch 'backport-java-new-packaging' into java-new-packagingBrad King2018-04-253-23/+91
|\ \ \ | |/ / | | | | | | Fix conflicts by combining the changes from both sides.
| * | FindJava, FindJNI, UseJava: update for version 10 supportMarc Chevrier2018-04-253-23/+91
| |/ | | | | | | | | | | | | * new version format * new registry layout on Windows Fixes: #17938
* | Merge topic 'BLAS-no-target-in-libs'Brad King2018-04-252-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | FindBLAS: do not write an imported target name into BLAS_LIBRARIESRolf Eike Beer2018-04-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | FindPkgConfig: do not unset unused variableRolf Eike Beer2018-04-241-1/+0
| |/ | | | | | | _props is never used, it was a leftover from a development step.
* | Merge topic 'testbigendian-cache-check-fix'Brad King2018-04-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 7b1c5f9f05 TestBigEndian: Include CheckTypeSize outside macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1999
| * | TestBigEndian: Include CheckTypeSize outside macroCristian Adam2018-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using https://github.com/cristianadam/cmake-checks-cache I have noticed that CheckTypeSize would in certain cases have an empty `__check_type_size_dir` variable. The errors would point to `TestBigEndian`. By moving `include(CheckTypeSize)` outside the macro, the errors go away. Including dependencies of a module when the module is first included is simpler and cleaner anyway.
* | | Merge topic 'cuda-no-cache-host-compiler'Brad King2018-04-251-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bff4651f2e CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2003
| * | | CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entryBrad King2018-04-241-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can create it through an explicit command-line option if desired. Initializing the variable as an empty cache entry can wipe out a normal variable of the same name that may have been set by a toolchain file. Since commit v3.8.0-rc1~261^2~11 (CUDA: Use the host compiler for linking CUDA executables and shared libs, 2016-09-19) we save the value of `CMAKE_CUDA_HOST_COMPILER` persistently in the compiler information file as a normal variable. Fixes: #17935
* | | Merge topic 'FindPython-stabilization'Brad King2018-04-241-5/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d02a9bacf6 FindPython: ensure correct architecture (i.e. 32/64bit) is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1991
| * | | FindPython: ensure correct architecture (i.e. 32/64bit) is usedMarc Chevrier2018-04-201-5/+74
| | | |
* | | | Merge topic 'CUDA7'Brad King2018-04-242-3/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fb2812d5b CUDA: Add compiler detection for CUDA < 7.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1993
| * | | | CUDA: Add compiler detection for CUDA < 7.5Henry Schreiner2018-04-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CUDA version macros are not defined, run `nvcc --version` and extract the version from its output. Fixes: #17920
* | | | | Merge topic 'cpack-doc-defaults'Brad King2018-04-241-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30c8c9f55d CPack: Add CPACK_PACKAGE_HOMEPAGE_URL setting c9fa8f9442 CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1998
| * | | | | CPack: Add CPACK_PACKAGE_HOMEPAGE_URL settingAlex Turbov2018-04-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Initialize it from `CMAKE_PROJECT_HOMEPAGE_URL`.
| * | | | | CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY defaultAlex Turbov2018-04-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge topic 'FindMatlab/mcr-compatibility'Brad King2018-04-241-222/+377
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 59fb9e89b2 FindMatlab: Matlab Runtime Compiler support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1970
| * | | | FindMatlab: Matlab Runtime Compiler supportRaffi Enficiaud2018-04-231-222/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Determining automatically the MCR version on OSX and Windows * Distinguishing between MCR and Matlab * Specific tests for the MCR * mexext on windows does not work properly: the mexext is hardcoded * Doc updates for the MCR Fixes: #16487
generated by cgit v0.12 at 2025-02-02 10:45:51 (GMT)