summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-GET_RUNTIME_DEPENDENCIES-terms' into release-3.18Brad King2020-07-231-2/+2
|\ | | | | | | | | | | | | 2b60088d14 Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5053
| * Help: Update file(GET_RUNTIME_DEPENDENCIES) prose to match option namesBrad King2020-07-231-2/+2
| |
* | Merge topic 'cmake-gui-qt-5.14' into release-3.18Brad King2020-07-231-2/+3
|\ \ | | | | | | | | | | | | | | | | | | af6cf586f6 cmake-gui: Fix crash when built with Qt 5.14 or later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5045
| * | cmake-gui: Fix crash when built with Qt 5.14 or laterBrad King2020-07-221-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | In commit d7679f6427 (QCMakeCacheView: use non-deprecated List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2) the conversion of the `this->properties()` value to QSet is incorrect for Qt 5.14+. The problem is that `this->properties()` returns by value, so the range `this->properties().begin(), this->properties().end()` provides iterators to two different instances. Use an intermediate temporary copy of the value to get a consistent iterator range. Fixes: #20981
* | Merge topic 'aux-install-dest' into release-3.18Brad King2020-07-222-8/+25
|\ \ | | | | | | | | | | | | | | | | | | 83bc79e232 Auxiliary: Add options to control Vim and Emacs file installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5035
| * | Auxiliary: Add options to control Vim and Emacs file installationBrad King2020-07-212-8/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | Since commit 2642f432ef (Aux: Install editor and bash files to more natural locations, 2020-03-30, v3.18.0-rc1~429^2) these files are installed by default into locations that are not CMake-specific but may be distro-specific. Add options for packagers to control these locations. Also rename the `CMAKE_BASH_COMP_DIR` option to follow our conventions. Fixes: #20993
* | Merge topic 'graphviz-restore-per-target' into release-3.18Brad King2020-07-225-7/+201
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 1829220310 Merge branch 'backport-3.17-graphviz-restore-per-target' f3a6b4a209 Tests: Cover Graphviz support for per-target dependency graph options 93549b9224 Graphviz: Restore support for per-target dependency graph options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5039
| * \ Merge branch 'backport-3.17-graphviz-restore-per-target'Brad King2020-07-215-7/+201
| |\ \ | | |/ | |/|
| | * Tests: Cover Graphviz support for per-target dependency graph optionsStephan Rohmen2020-07-213-0/+56
| | | | | | | | | | | | Issue: #20928
| | * Graphviz: Restore support for per-target dependency graph optionsStephan Rohmen2020-07-212-7/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behaviors controlled by options `GRAPHVIZ_GENERATE_PER_TARGET` and `GRAPHVIZ_GENERATE_DEPENDERS` were broken by commit 553658393c (Graphviz: added test suite, fixes, enhancements, 2019-10-08, v3.17.0-rc1~615^2). It had not been covered in the test suite previously, and those changes left out checks for these features from the `default_options` case. Implement the previously-existing behavior in the new graphviz generation engine added by the above-mentioned commit. Fixes: #20928
* | | Merge topic 'ghs-crash' into release-3.18Brad King2020-07-211-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5da2c71165 GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5033
| * | | GHS: Fix crash when GHS_NO_SOURCE_GROUP_FILE property is not definedBrad King2020-07-201-2/+3
| |/ / | | | | | | | | | | | | | | | | | | Refactoring in commit 36aba01223 (cmGeneratorTarget::GetProperty: return cmProp, 2020-04-29, v3.18.0-rc1~246^2) left out a `nullptr` check. Fixes: #20985
* | | Merge topic 'bootstrap-system-http2' into release-3.18Brad King2020-07-211-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64bc82bb4d bootstrap: Add options to control use of system nghttp2 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Grüninger <foss@grueninger.de> Merge-request: !5031
| * | | bootstrap: Add options to control use of system nghttp2Brad King2020-07-201-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Add `bootstrap` options needed since commit 0b872fd4be (nghttp2: Build the library within CMake for use by our curl, 2020-04-01, v3.18.0-rc1~408^2~2). Fixes: #20987
* | | Merge topic 'strdup' into release-3.18Brad King2020-07-211-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eea0337c7d centos5: Fix FTBFS with strdup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5026
| * | | centos5: Fix FTBFS with strdupJulien Schueller2020-07-201-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Since commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2) we need to explicitly enable availability of `strdup`. Fixes: #20971
* | | Merge topic 'xcode-native-arch' into release-3.18Craig Scott2020-07-215-1/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26673bf480 Xcode: Explicitly specify default native architecture on macOS ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5023
| * | | Xcode: Explicitly specify default native architecture on macOSBrad King2020-07-204-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_OSX_ARCHITECTURES` is not specified, we add the Xcode setting `ONLY_ACTIVE_ARCH = YES` with the intention of targeting the native architecture of the host. However, the default `ARCHS` value chosen by "Xcode 12 Universal Apps" includes multiple architectures. Add an explicit `ARCHS` setting with value `$(NATIVE_ARCH_ACTUAL)` to tell Xcode to use the host's native architecture only. Fixes: #20893
| * | | cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in memberBrad King2020-07-162-0/+9
| |/ /
* | | Merge topic 'swift-link-iface' into release-3.18Brad King2020-07-202-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 14a5712447 Swift: Fix regression in linking to interface libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5027
| * | | Swift: Fix regression in linking to interface librariesBrad King2020-07-172-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2026915f8f (Swift: Propagate Swift_MODULE_DIRECTORY as include directory, 2020-02-03, v3.18.0-rc1~547^2) we internally call `GetAllConfigCompileLanguages` on all directly linked targets without checking if they are interface libraries that don't compile at all. That violates an internal assumption and assertion. Fixes: #20977
* | | Merge topic 'ninja-multi-rsp' into release-3.18Brad King2020-07-171-4/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 99ed39b011 Ninja Multi-Config: Make link response files per-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5020
| * | Ninja Multi-Config: Make link response files per-configKyle Edwards2020-07-161-4/+14
| |/ | | | | | | Fixes: #20961
* | CMake 3.18.0v3.18.0Brad King2020-07-151-1/+1
| |
* | Merge topic 'doc-find_package' into release-3.18Brad King2020-07-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | cc92a4c228 Help: Fix typo in find_package documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5014
| * | Help: Fix typo in find_package documentationKai Koehne2020-07-151-1/+1
| | |
* | | Merge topic 'nvcc_host' into release-3.18Brad King2020-07-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff086f066b NVCC: Handle host compiler with spaces in path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5019
| * | | NVCC: Handle host compiler with spaces in pathRaul Tambre2020-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to surround it with quotes otherwise the different bits are passed as separate arguments. Fixes #20954.
* | | | Merge topic 'source_file_props_dedup_scopes' into release-3.18Craig Scott2020-07-142-2/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | f6969b917d set_property: Deduplicate source file directory scopes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5009
| * | | set_property: Deduplicate source file directory scopesAlexandru Croitor2020-07-132-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user could specify the same directory scope to set_property() multiple times, which in conjunction with APPEND would append the property multiple times. Make sure to deduplicate scopes across both DIRECTORY and TARGET_DIRECTORY options, so that a property is only appended once in such a scenario. Fixes: #20941
* | | | Merge topic 'macos-11-file-GET_RUNTIME_DEPENDENCIES' into release-3.18Brad King2020-07-142-13/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9af90504f Tests: Update file(G_R_D) test to make system library optional c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4998
| * | | | Tests: Update file(G_R_D) test to make system library optionalKyle Edwards2020-07-131-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Since the system library may not exist on the filesystem on macOS 11, skip it if it doesn't exist.
| * | | | file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cacheBrad King2020-07-131-1/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting on macOS 11, the dynamic loader has a builtin cache of system-provided dylib files. They do not actually exist on the filesystem. However, runtime dependencies recorded in Mach-O binaries can still have `LC_LOAD_DYLIB` entries referring to such dylib files by absolute path. The dynamic loader simply resolves the paths from its cache. Teach `file(GET_RUNTIME_DEPENDENCIES)` to skip dependencies on such dylib paths. For practical software distribution purposes they do not exist, or at least can be assumed available on all deployments. Issue: #20863
* | | | Merge topic 'profiling-case-insensitive-command-names' into release-3.18Brad King2020-07-143-2/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 7cf2f7d2af cmake: Store lowercase command names in profiling output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5007
| * | | cmake: Store lowercase command names in profiling outputCraig Scott2020-07-133-2/+19
| |/ / | | | | | | | | | | | | | | | | | | This ensures commands can be properly aggregated by tools processing the profiling output. Fixes: #20946
* | | Merge topic 'imported-local-target-alias' into release-3.18Brad King2020-07-135-6/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5002
| * | | ALIAS targets: Non-global aliases must be propagated to sub-directoriesMarc Chevrier2020-07-115-6/+28
| |/ / | | | | | | | | | Fixes: #20942
* | | Merge topic 'doc-source-prop-dir-options' into release-3.18Brad King2020-07-134-56/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0bdb1a77d1 Help: Clarify wording of dir-related source property options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5000
| * | | Help: Clarify wording of dir-related source property optionsCraig Scott2020-07-134-56/+84
| |/ /
* | | Merge topic 'supported-profiling-formats' into release-3.18Brad King2020-07-131-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 9c3beb532f cmake: Show supported formats in --help output for --profiling-format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: dublet <github@dublet.org> Merge-request: !5001
| * | cmake: Show supported formats in --help output for --profiling-formatCraig Scott2020-07-111-1/+3
|/ / | | | | Fixes: #20943
* | CMake 3.18.0-rc4v3.18.0-rc4Brad King2020-07-101-1/+1
| |
* | Merge topic 'source_file_both_props' into release-3.18Brad King2020-07-1010-33/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 961ee62faa Help: Update get_property and get_source_file_property docs 1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together 177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4994
| * | Help: Update get_property and get_source_file_property docsAlexandru Croitor2020-07-092-2/+2
| | | | | | | | | | | | Specify the names and alternatives a bit more clearly.
| * | set_property: Allow both DIRECTORY and TARGET_DIRECTORY togetherAlexandru Croitor2020-07-096-26/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to specify both DIRECTORY and TARGET_DIRECTORY at the same time in `set_source_files_properties()` and `set_property(SOURCE)` commands. Add test cases and update the documentation. Fixes: #20932
| * | set_property: Fix name of TARGET_DIRECTORY option in error messagesAlexandru Croitor2020-07-093-5/+5
| | |
* | | Merge topic 'irsl-intel-ia32' into release-3.18Brad King2020-07-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
| * | | IRSL: Fix path to Intel 32-bit redist librariesTorgeir Rusten2020-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The path to the 32 bit libraries in the Intel windows/redist folder use ia32. I don't remember if this has changed at some point, but ia32 has been used at least since Intel Fortran XE 2018.
* | | | Merge topic 'FindOpenMP-version' into release-3.18Brad King2020-07-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
| * | | | FindOpenMP: Set version variables every time CMake runsBrad King2020-07-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version is determined in two steps. First, the "spec date" is detected and cached. Second, the date is converted to a version. Move the second step out of the spec date cache guard condition so that it runs every time even if the spec date is already cached. Fixes: #19150
generated by cgit v0.12 at 2025-09-08 00:30:10 (GMT)