summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | Merge topic 'productbuild_missing_var_docs'Brad King2018-04-231-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e41d44b38 Help: Document missing variables for productbuild CPack generator Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !1995
| * | | | Help: Document missing variables for productbuild CPack generatorCraig Scott2018-04-211-0/+16
| | |/ / | |/| | | | | | | | | | Missing variables were CPACK_PREFLIGHT_<COMP>_SCRIPT and CPACK_POSTFLIGHT_<COMP>_SCRIPT.
* | | | Merge topic 'cuda-arch-repair'Brad King2018-04-231-13/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 61b222f3ae CUDA/select_compute_arch: Fix detection on old CUDA with new card/driver Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1987
| * | | CUDA/select_compute_arch: Fix detection on old CUDA with new card/driverHenry Schreiner2018-04-201-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix version comparisons to handle patch components. List and check known archs for each version of CUDA so mismatching versions are not suggested. Fixes: #17921
* | | | Merge topic 'FindPython-debian-cross-comp'Brad King2018-04-201-15/+23
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 7855e4d6b7 FindPython: Add cross-compilation support for Debian-based systems. Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@sap.com> Merge-request: !1961
| * | | FindPython: Add cross-compilation support for Debian-based systems.Yee Fan2018-04-181-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debian-based Linux distributions locate their architecture-specific pythonX.Y-config tool at /usr/bin/<arch>-python<X.Y>-config. We first attempt to find and use the architecture-specific pythonX.Y-config tool. If the pythonX.Y-config tools are absent, then we proceed to find the architecture-specific Python libraries. Fixes: #17912
* | | | Merge topic 'FindJPEG-imported-targets'Brad King2018-04-191-15/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87f2cf3b1c FindJPEG: Add imported target support and full test 13952a3b7f FindJPEG: Add multi config support and associated docs 1f6649b7d1 FindJPEG: Add version detection and associated test update and docs 8d07408a62 FindJPEG: Cleanup documentation formatting e70da3f0f3 FindJPEG: Clean up whitepaces and lowercase function names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1974
| * | | | FindJPEG: Add imported target support and full testMateusz Loskot2018-04-181-2/+40
| | | | |
| * | | | FindJPEG: Add multi config support and associated docsMateusz Loskot2018-04-171-2/+22
| | | | |
| * | | | FindJPEG: Add version detection and associated test update and docsMateusz Loskot2018-04-171-1/+26
| | | | |
| * | | | FindJPEG: Cleanup documentation formattingMateusz Loskot2018-04-171-9/+15
| | | | |
| * | | | FindJPEG: Clean up whitepaces and lowercase function namesMateusz Loskot2018-04-171-5/+5
| | | | |
* | | | | Merge topic 'InstallRequiredSystemLibraries-mfcm'Brad King2018-04-191-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdf660cab5 InstallRequiredSystemLibraries: Check for existence of mfcm dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1980
| * | | | | InstallRequiredSystemLibraries: Check for existence of mfcm dllsChristof Krüger2018-04-181-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only existence of `mfc${v}.dll` and `mfc${v}d.dll` variants was checked and it was assumed that the managed variants `mfcm*.dll` also existed. This assumption doesn't hold with Visual Studio 2017. Check each file separately. Fixes: #17913
| * | | | Merge branch 'FindOpenMP-Intel-Windows' into release-3.11Brad King2018-04-161-13/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1957
| * \ \ \ \ Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1967
| * \ \ \ \ \ Merge branch 'features-msvc-2017' into release-3.11Brad King2018-04-111-21/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1903
* | \ \ \ \ \ \ Merge topic 'depfile-flag'Brad King2018-04-193-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67962c55a SunPro,XL: Add depfile flags to support Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1969
| * | | | | | | | SunPro,XL: Add depfile flags to support Ninja generatorEphi Sinowitz2018-04-173-0/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CMAKE_DEPFILE_FLAGS_${lang} to SunPro and XL. These flags are used by the Ninja generator.
* | | | | | | | Merge topic 'CheckIncludeFile-required-libs'Brad King2018-04-193-0/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a61ae3fb80 CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES 391a5837ee cmake_policy: Add undocumented PARENT_SCOPE option to GET 3c47ac5b25 OpenWatcom: Add workaround for lack of error on missing library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1978
generated by cgit v0.12 at 2025-02-03 13:59:45 (GMT)