summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindCUDA: Do not find cublas_device on CUDA >= 9.2Kenta Kubo2018-08-231-1/+2
| | | | | | | The `cublas_device` has been deprecated and will be removed in future versions of CUDA. Issue: #18290
* CMake 3.12.1v3.12.1Brad King2018-08-091-1/+1
|
* Merge branch 'cuda-arch-version' into release-3.12Brad King2018-08-011-2/+3
|\ | | | | | | Merge-request: !2251
| * FindCUDA/select_compute_arch: Restore two-component CUDA_VERSIONBrad King2018-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~332^2 (FindCUDA/select_compute_arch: Add support for CUDA as a language, 2018-03-15) this module sets `CUDA_VERSION` based on `CMAKE_CUDA_COMPILER_VERSION` when the language is enabled. Limit it to two components for consistency with the normal `FindCUDA` documentation and behavior. Fixes: #18231
* | Merge branch 'UseSWIG-legacy-user-flags' into release-3.12Brad King2018-07-311-3/+4
|\ \ | | | | | | | | | Merge-request: !2245
| * | UseSWIG: restore legacy behavior for SWIG_MODULE_<name>_EXTRA_FLAGSMarc Chevrier2018-07-311-3/+4
|/ / | | | | | | Fixes: #18226
* | Merge branch 'cpack-default-package-version-zero' into release-3.12Craig Scott2018-07-298-12/+39
|\ \ | | | | | | | | | Merge-request: !2239
| * | CPack: Restore support for 0-valued version componentsBrad King2018-07-278-12/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.12.0-rc1~136^2 (CPack: Use project version as default for `CPACK_PACKAGE_VERSION`, 2018-04-29) we did not account for the value of `CMAKE_PROJECT_VERSION_{MAJOR,MINOR,PATCH}` having `0`. Fix the logic to distinguish between unprovided version components and `0` components. While at it, add a test case covering the behavior described in the documentation by the original commit. The number of version components in the package name should match those provided to the `project()` command `VERSION` option. Fixes: #18199
* | Merge branch 'googletest_policy_settings' into release-3.12Brad King2018-07-251-0/+7
|\ \ | | | | | | | | | Merge-request: !2237
| * | GoogleTest: Ensure policy settings allow use of IN_LISTCraig Scott2018-07-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | If policy settings at the time the GoogleTest module is included are such that CMP0057 is unset or set to OLD, the use of IN_LIST with if() will lead to an error. Therefore, explicitly specify the policy settings for the whole file to ensure the function implementations have access to the required CMake features. Fixes: #18198
* | | Merge branch 'project-injected-no-cmp0048' into release-3.12Craig Scott2018-07-256-2/+25
|\ \ \ | |/ / |/| |
| * | project: Do not issue CMP0048 warnings on injected callBrad King2018-07-243-14/+9
| | | | | | | | | | | | Fixes: #18202
| * | Tests: Add case showing CMP0048 warning on injected project commandBrad King2018-07-245-0/+28
| |/ | | | | | | Issue: #18202
* | Merge branch 'FindPython-fix-multiple-calls' into release-3.12Brad King2018-07-231-5/+1
|\ \ | | | | | | | | | Merge-request: !2228
| * | FindPython*: fix erroneous behavior on multiple 'find_package' callsMarc Chevrier2018-07-231-5/+1
| |/ | | | | | | Fixes: #18192
* | Merge branch 'doc-find_package-root' into release-3.12Brad King2018-07-2010-23/+64
|\ \ | | | | | | | | | Merge-request: !2225
| * | Help: Add explicit <PackageName>_ROOT variable documentationBrad King2018-07-2010-23/+64
| |/ | | | | | | | | | | Add documentation for both the CMake variable and environment variable of this name pattern. Update references to these names to link to their documents. Clarify the pattern used to construct their names.
* | Merge branch 'tcl-8.7' into release-3.12Brad King2018-07-183-0/+9
|\ \ | | | | | | | | | Merge-request: !2223
| * | FindTCL: Add support for version 8.7Dima Panov2018-07-183-0/+9
| |/ | | | | | | Fixes: #18186
* | Merge branch 'UseSWIG-csharp-conditional' into release-3.12Brad King2018-07-181-1/+1
|\ \ | | | | | | | | | Merge-request: !2219
| * | UseSWIG: Use CSharp language only if it is enabledBrad King2018-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.12.0-rc1~2^2 (UseSWIG: Add CSHARP variant for wrapper files, 2018-06-08) we explicitly marked swig-generated `.cs` files as `LANGUAGE` CSharp so that the resulting sources can be compiled. However, this works only when the CSharp language has been enabled. Fixes: #18184
* | | Merge branch 'csharp-compiler-loaded' into release-3.12Brad King2018-07-181-0/+1
|\ \ \ | |/ / | | / | |/ |/| Merge-request: !2220
| * CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabledBrad King2018-07-181-0/+1
|/ | | | We already do this for C, CXX, Fortran, etc.
* CMake 3.12.0v3.12.0Brad King2018-07-171-1/+1
|
* Merge branch 'doc-add_library-IMPORTED_OBJECTS' into release-3.12Brad King2018-07-161-2/+5
|\ | | | | | | Merge-request: !2216
| * Help: Mention IMPORTED_OBJECTS in add_library docsBrad King2018-07-161-2/+5
| | | | | | | | | | | | | | The `IMPORTED_OBJECTS` is to object libraries as `IMPORTED_LOCATION` is to normal libraries. Fixes: #18176
* | Merge branch 'intel-std-fix' into release-3.12Brad King2018-07-122-8/+10
|\ \ | | | | | | | | | Merge-request: !2206
| * | Intel: Fix incorrectly documented extension flagsChristian Pfeiffer2018-07-122-8/+10
| | | | | | | | | | | | Fixes: #18166
* | | Merge branch 'boost-1.68-beta1' into release-3.12Brad King2018-07-121-4/+23
|\ \ \ | | | | | | | | | | | | Merge-request: !2204
| * | | FindBoost: Change context header usedRoger Leigh2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | boost/context/all.hpp is removed in Boost 1.68. boost/context/detail/fcontext.hpp is present in all Boost releases containing context (≥1.61).
| * | | FindBoost: Add support for Boost 1.68 beta1Roger Leigh2018-07-111-3/+22
| | |/ | |/| | | | | | | | | | | | | This includes a new component, `Boost::contract`. Fixes: #18167
* | | Merge branch 'qnx_fix' into release-3.12Brad King2018-07-121-0/+2
|\ \ \ | |_|/ |/| | | | | Merge-request: !2205
| * | QNX: Fix autogen compiler predefines detectionCristian Adam2018-07-111-0/+2
| |/ | | | | | | | | | | In commit v3.12.0-rc1~20^2 (Move GNU COMPILER_PREDEFINES_COMMAND from Platform to Compiler, 2018-06-01), `Compiler/GNU.cmake` introduced the `-dM` flag, which requires `-Wp` prefix for the QNX compiler wrapper.
* | Merge branch 'document_object_library_as_a_property_type' into release-3.12Brad King2018-07-101-2/+2
|\ \ | |/ |/| | | Merge-request: !2199
| * Help: Add OBJECT_LIBRARY to TYPE target property documentationRobert Maynard2018-07-101-2/+2
|/
* CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
|
* Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
|\ | | | | | | Merge-request: !2177
| * VS: Only link cs files when they're not in binary dirRobert Dailey2018-07-061-4/+7
| | | | | | | | | | | | When `*.cs` files are provided, do not generate a `<Link>` element in the `.csproj` project if those files are descendants of `CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
* | Merge branch 'doc-add_compile_definitions' into release-3.12Brad King2018-07-051-3/+3
|\ \ | | | | | | | | | Merge-request: !2192
| * | Help: fix add_compile_definitions() documentationMarc Chevrier2018-07-051-3/+3
| | | | | | | | | | | | Fixes: #18147
* | | Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-0318-107/+10
|\ \ \ | | | | | | | | | | | | Merge-request: !2191
| * | | Revert "target_link_libraries: Allow use with targets in other directories"Brad King2018-07-0318-107/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with targets in other directories, 2018-05-11). The RHS target scoping and visibility rules are not clear and will need further investigation before the feature can be added. Issue: #17943
* | | Merge branch 'FindLua-CMP0012' into release-3.12Brad King2018-07-031-0/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !2189
| * | | FindLua: Set CMP0012 to NEW for the revised search codeAdriaan de Groot2018-07-031-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | Code added by commit v3.12.0-rc1~53^2 (FindLua: Search for lua.h using more conventional paths, 2018-05-20) depends on `CMP0012` NEW behavior. Set the policy explicitly for the scope of the FindLua module. Fixes: #18142
* | | Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12Brad King2018-07-035-53/+115
|\ \ \ | |_|/ |/| | | | | Merge-request: !2188
| * | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-035-53/+115
| |/ | | | | | | Fixes: #18140
* | Merge branch 'cpack-fix-deb-packaging' into release-3.12Brad King2018-07-021-0/+6
|\ \ | | | | | | | | | Merge-request: !2178
| * | CPack/Deb: Restore setting of root as the owner of filesAndrew Fuller2018-07-021-0/+6
| |/ | | | | | | | | | | Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use libarchive to create .deb file) accidentally broke this for the top-level archive.
* | Merge branch 'policy_max_docs' into release-3.12Brad King2018-07-023-2/+10
|\ \ | |/ |/| | | Merge-request: !2180
| * Help: Clarify ...<max> behavior for policy-related commandsCraig Scott2018-07-013-2/+10
|/ | | Affects cmake_minimum_required() and cmake_policy(VERSION)