summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Fix CSharp flag selection when linking to a static C++ libraryBrad King2018-10-021-3/+5
| | | | | | | | | | | | | | When a CSharp target links to a static C++ library, CMake will compute the link language as C++ instead of CSharp. That may be incorrect and needs further investigation, but it does not affect how VS drives C# linking. However, it does break our flag language selection logic and causes C++ flags to be used for CSharp. In particular, this drops the `-platform:x86` flag on 32-bit builds. Fix this by always selecting the CSharp flags when generating a `.csproj` project type. Issue: #18239
* CMake 3.12.2v3.12.2Brad King2018-09-071-1/+1
|
* Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12Brad King2018-09-051-15/+0
|\ | | | | | | Merge-request: !2354
| * FindMatlab: Remove erroneous duplicate codeRaffi Enficiaud2018-09-051-15/+0
| | | | | | | | | | | | | | This was left accidentally when resolving merge conflicts between previous changes. Fixes: #18221
* | Merge branch 'vs-CMakeLists.txt' into release-3.12Brad King2018-09-051-1/+5
|\ \ | | | | | | | | | Merge-request: !2349
| * | VS: Restore CMakeLists.txt references in each targetBrad King2018-09-051-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The custom command de-duplication added by commit v3.12.0-rc1~171^2 (VS: Generate a custom command only in the least dependent target, 2018-03-23) accidentally also applied to the `CMakeLists.txt` file reference we put in each target. This file reference comes with a custom command that has no dependencies and that is safe to run repeatedly across multiple targets (via internal stamp checking). Therefore it should be excluded from the de-duplication so that `CMakeLists.txt` references appear in all targets for human reference. Fixes: #18310
* | Merge branch 'FindBoost-old-context' into release-3.12Brad King2018-09-041-1/+5
|\ \ | | | | | | | | | Merge-request: !2348
| * | FindBoost: Fix context discovery for 1.60 and belowIgor Kostenko2018-09-041-1/+5
| |/ | | | | | | | | | | | | | | | | * `all.hpp` was removed in 1.68: https://github.com/boostorg/context/commit/2e37599461912cc1679f106a25456a493f7f0b27 * `fcontext.hpp` was moved to detail in 1.61: https://github.com/boostorg/context/commit/c2f0dfdf2608c1ebaa2229fa6f358fe6aa103561 Fixes: #18126
* | Merge branch 'CheckIPOSupported-output-backslashes' into release-3.12Brad King2018-08-301-4/+11
|\ \ | | | | | | | | | Merge-request: !2331
| * | CheckIPOSupported: Tolerate backslashes in output of failed checksBrad King2018-08-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid passing the output of our `try_compile` through a macro argument. Macro invocations re-parse their arguments and so should not be given arbitrary content that may contain backslashes and such. Instead pass a simple message. This is also more readable in the case that the macro generates a message itself. After the macro returns, report the real output directly to the variable named by our caller. Also record the output in a log file as other checks do on failure. Fixes: #18244
| * | CheckIPOSupported: Simplify result reporting logicBrad King2018-08-301-3/+4
| |/ | | | | | | | | | | Simplify the test for whether a `RESULT` argument was given to the `check_ipo_supported` call. Also do not set an empty variable name if `OUTPUT` was not given.
* | Merge branch 'android-ndk-r18' into release-3.12Brad King2018-08-285-9/+29
|\ \ | | | | | | | | | Merge-request: !2319
| * | Android: Add support for NDK r18Brad King2018-08-285-9/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | NDK r18 drops GCC toolchains and some STL types. We need to choose a clang toolchain by default when no gcc toolchains are available. Switch the STL type default to `c++_static` when the old `gnustl_static` default is not available. Update the test suite to not run tests for STL types that do not exist. Also do not expect the gcc toolchain `cpp` tool to be available because r18 does not provide it. Also teach it to tolerate `gcc -dumpmachine` output like `arm--linux-android` that differs from the toolchain prefix. Fixes: #18301
* | Merge branch 'doc-clang-tidy-typo' into release-3.12Brad King2018-08-241-1/+1
|\ \ | | | | | | | | | Merge-request: !2303
| * | Help: Fix typo in clang-tidy example -checks optionDavid Demelier2018-08-241-1/+1
| |/
* | Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12Brad King2018-08-231-1/+2
|\ \ | | | | | | | | | Merge-request: !2298
| * | 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
* | Merge branch 'cuda-no-cublas_device' into release-3.12Brad King2018-08-233-2/+8
|\ \ | | | | | | | | | Merge-request: !2296
| * | CUDA: Avoid using deprecated cublas_device to identify device lib dirsRobert Maynard2018-08-233-2/+8
| |/ | | | | | | | | | | | | Use `curand_static` to identify directories containing device libraries because `cublas_device` is deprecated and will be removed in the future. Issue: #18290
* | Merge branch 'state-reset-glob' into release-3.12Brad King2018-08-233-0/+11
|\ \ | | | | | | | | | Merge-request: !2278
| * | cmState: Clear GlobVerificationManager state on ResetShane Parris2018-08-093-0/+11
| |/ | | | | | | | | | | It should not persist across multiple configure rounds. Fixes: #18208
* | Merge branch 'export-properties-undefined' into release-3.12Craig Scott2018-08-183-0/+17
|\ \ | |/ |/| | | Merge-request: !2294
| * EXPORT_PROPERTIES: Prevent null dereference for undefined propertyCraig Scott2018-08-161-0/+5
| | | | | | Fixes: #18260
| * EXPORT_PROPERTIES: Add test for an undefined propertyCraig Scott2018-08-162-0/+12
|/ | | | The added test verifies that a property listed in EXPORT_PROPERTIES can be undefined. It confirms the crash recorded in issue #18260.
* 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
generated by cgit v0.12 at 2025-01-24 05:23:48 (GMT)