summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix transitive usage requirements through same-name imported targetsBrad King2018-09-1010-47/+54
| | | | | | | | | | If two imported targets in different directories have the same name we should still be able to propagate transitive usage requirements from both. Fix the DAG checker to work with target pointers instead of target names since the pointers will not be duplicated even if the names are. Fixes: #18345
* genex: Simplify cmGeneratorExpressionInterpreterBrad King2018-09-079-87/+36
| | | | | | | | | All callers were constructing with a non-empty target name using the target whose pointer was passed anyway. Drop this argument. Simplify logic accordingly. Re-order constructor arguments to match the cmCompiledGeneratorExpression::Evaluate arguments. Also remove unnecessary getters.
* Fix dependency propagation through same-name imported targetsBrad King2018-09-0712-41/+82
| | | | | | | | | | If two imported targets in different directories have the same name we should still be able to propagate transitive link dependencies from both. Fix the target and link dependency analyzers to de-duplicate targets using target pointers rather than target names since the pointers will not be duplicated even if the names are. Issue: #18345
* cmLinkItem: Convert to a "sum type" over a string and target pointerBrad King2018-09-0710-66/+145
| | | | | | | | | Avoid exposing the item name implicitly as std::string. When the item is a target, avoid storing a second copy of its name. Most link item construction is paired with calls to `FindTargetToLink` to get the possible target pointer. Rename these methods to `ResolveLinkItem` and refactor them to construct the entire item.
* Merge topic 'CMakeFindBinUtils-fix-not-cached'Brad King2018-09-061-3/+15
|\ | | | | | | | | | | | | 53bae4cc5e CMakeFindBinUtils: Fix use with non-cached tool settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2355
| * CMakeFindBinUtils: Fix use with non-cached tool settingsBrad King2018-09-051-3/+15
| | | | | | | | | | | | | | | | | | | | If a project or toolchain file hard-codes a tool location such as `CMAKE_LINKER` with a plain `set()` then the value will be stored in compiler information files but not cached. If the value is not cached then we should not mark it as advanced because doing so will initialize an empty cache entry. Fixes: #18315
* | Merge branch 'release-3.12'Brad King2018-09-060-0/+0
|\ \
| * \ Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12Brad King2018-09-051-15/+0
| |\ \ | | | | | | | | | | | | Merge-request: !2354
* | \ \ Merge topic 'FindMatlab-no-CMAKE_CL_64'Brad King2018-09-061-15/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | bfe883af60 FindMatlab: Remove erroneous duplicate code Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'grd-stdstring'Brad King2018-09-0613-23/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d89830d71 cmMakefile: Make GetRequiredDefinition return std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2347
| * | | | cmMakefile: Make GetRequiredDefinition return std::stringVitaly Stakhovsky2018-09-0513-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases the return value is converted to std::string anyway. Also remove unnecessary `c_str()` calls in arguments to `GetRequiredDefinition`.
* | | | | Merge topic 'isonoff-cstr'Brad King2018-09-0624-43/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f16be6a62 Remove unnecessary c_str() calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2346
| * | | | | Remove unnecessary c_str() callsVitaly Stakhovsky2018-09-0524-43/+40
| |/ / / / | | | | | | | | | | | | | | | Use the new IsOn(),IsOff() overloads.
* | | | | CMake Nightly Date StampKitware Robot2018-09-061-1/+1
| | | | |
* | | | | Merge topic 'cmake-gui-align-text'Brad King2018-09-051-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 13a2751ca6 cmake-gui: Align source and binary directory path text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2344
| * | | | cmake-gui: Align source and binary directory path textZeex2018-09-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text inputs for "where is the source code" and "where to build the binaries" had different amount of left spacing, so the two paths were not aligned. This could create a feeling that you typed something wrong in the input even though the paths were identical or had a common root path.
* | | | | Merge branch 'release-3.12'Brad King2018-09-050-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'vs-CMakeLists.txt' into release-3.12Brad King2018-09-051-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2349
| * \ \ \ \ Merge branch 'FindBoost-old-context' into release-3.12Brad King2018-09-041-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2348
* | \ \ \ \ \ Merge topic 'vs-CMakeLists.txt'Brad King2018-09-051-1/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b82e68f2f VS: Restore CMakeLists.txt references in each target Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'FindBoost-old-context'Brad King2018-09-051-1/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a800c12fc FindBoost: Fix context discovery for 1.60 and below Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | CMake Nightly Date StampKitware Robot2018-09-051-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cpack_test'Brad King2018-09-042-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a7e94d6f7 CPack (DEB/RPM): add test for per-component description/summmary. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2333
| * | | | CPack (DEB/RPM): add test for per-component description/summmary.David Faure2018-08-302-1/+20
| | | | |
* | | | | Merge topic 'cmakeServerSourcesForInterfaceLibraries'Brad King2018-09-043-40/+191
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d74c2282ea cmake-server: Support codemodel filegroups for INTERFACE_SOURCES Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tobias Hunger <tobias.hunger@gmail.com> Acked-by: Markus Enzenberger <markus.enzenberger@gmail.com> Merge-request: !2282
| * | | | | cmake-server: Support codemodel filegroups for INTERFACE_SOURCESJustin Goshi2018-08-303-40/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change returns information for INTERFACE_SOURCES. We add a flag to the filegroup to indicate if the target represents interface sources. Protocol version is updated to 1.3 since this is a change to what was released in cmake version 3.12.
* | | | | | Merge topic 'improve-isonoff'Brad King2018-09-042-35/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bfe6991ff cmSystemTools: Re-implement IsOn,IsOff with manual branching 1fa0f2bd03 cmSystemTools: Add IsOn(),IsOff() overloads accepting std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2336
| * | | | | | cmSystemTools: Re-implement IsOn,IsOff with manual branchingBrad King2018-08-311-35/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of std::string allocation, std::set lookups, and toupper conversions with explicit manual logic to do case-insensitive recognition of a specific set of strings.
| * | | | | | cmSystemTools: Add IsOn(),IsOff() overloads accepting std::stringVitaly Stakhovsky2018-08-312-0/+12
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-09-041-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-09-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-011-1/+1
| | | | | |
* | | | | | Merge topic 'FindBLAS-implicit-blas-final'Brad King2018-08-311-498/+526
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cdff15ef7 FindBLAS: Make Intel MKL the most preferred explicit BLAS library again 608de88f29 FindBLAS: Make Intel MKL code block respect prior found BLAS libraries 5b8f69ebe9 FindBLAS: Detect implicitly linked BLAS library 2c807b75f3 FindBLAS: Re-indent module source code to use normal conventions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2312
| * | | | | | FindBLAS: Make Intel MKL the most preferred explicit BLAS library againHubertus van Dam2018-08-301-180/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the "if (NOT BLAS_LIBRARIES)" statement to the Intel MKL detection code block we have unintentionally turned Intel MKL from the most preferred into the least preferred BLAS library. To fix this issue the Intel MKL detection code block needs to be moved forward to make it the first explicit BLAS library we test for. This is change does just that and re-instates Intel MKL as the most preferred explicit BLAS library.
| * | | | | | FindBLAS: Make Intel MKL code block respect prior found BLAS librariesHubertus van Dam2018-08-301-155/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All non-Intel BLAS library detection blocks have an if-statement "if (NOT BLAS_LIBRARIES)" to ensure that if a BLAS library was found we are not going to try and find another one. This causes a problem when we have already found that we do not need to specify a BLAS library, as the Intel MKL library takes precedence over everything. Introducing the "if (NOT BLAS_LIBRARIES)" if-statement fixes this problem.
| * | | | | | FindBLAS: Detect implicitly linked BLAS libraryHubertus van Dam2018-08-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the Check_Fortran_Libraries macro with an *empty* list of libraries to detect whether the compiler implicitly links BLAS. If this works, set `BLAS_LIBRARIES` to a placeholder value to get through the rest of our logic. At the end replace the placeholder by a real empty string again to report to callers.
| * | | | | | FindBLAS: Re-indent module source code to use normal conventionsKitware Robot2018-08-301-476/+476
| | | | | | |
* | | | | | | Merge topic 'vs-winrt-default'Brad King2018-08-313-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e78a0c8e8a VS: Add option to tell generator that platfrom is WinRT by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2315
| * | | | | | | VS: Add option to tell generator that platfrom is WinRT by defaultMikhail Korolev2018-08-303-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a ``CMAKE_VS_WINRT_BY_DEFAULT`` variable to indicate this. Fixes: #18286
* | | | | | | | Merge topic 'gg-stdstring'Brad King2018-08-313-16/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e94f6447a cmGlobalGenerator::AddInstallComponent(): Accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2332
| * | | | | | | | cmGlobalGenerator::AddInstallComponent(): Accept std::string argumentVitaly Stakhovsky2018-08-303-16/+16
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.12'Brad King2018-08-310-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'CheckIPOSupported-output-backslashes' into release-3.12Brad King2018-08-301-4/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2331
* | \ \ \ \ \ \ \ Merge topic 'CheckIPOSupported-output-backslashes'Brad King2018-08-311-4/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e1ea02bb8 CheckIPOSupported: Tolerate backslashes in output of failed checks b7dbb25a0a CheckIPOSupported: Simplify result reporting logic Acked-by: Kitware Robot <kwrobot@kitware.com> 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.
generated by cgit v0.12 at 2025-02-02 18:08:12 (GMT)