summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmLocalVisualStudio7Generator: Clarify condition for target that compilesBrad King2018-01-111-1/+1
|
* Merge branch 'release-3.10'Brad King2018-01-110-0/+0
|\
| * Merge branch 'backport-autogen-nexist-source-fix' into release-3.10Brad King2018-01-101-5/+17
| |\ | | | | | | | | | Merge-request: !1650
* | \ Merge topic 'autogen-nexist-source-fix'Brad King2018-01-111-4/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be304fb8 Merge branch 'backport-autogen-nexist-source-fix' into autogen-nexist-source-fix d592bfc9 Autogen: Ignore not existing source files in cmMakefile 513eb014 Autogen: Ignore not existing source files in cmMakefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1651
| * \ \ Merge branch 'backport-autogen-nexist-source-fix' into autogen-nexist-source-fixBrad King2018-01-110-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Autogen: Ignore not existing source files in cmMakefileSebastian Holtermann2018-01-101-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until CMake 3.10 a list of source files that had the AUTOUIC_OPTIONS property populated was kept in `cmMakefile::QtUiFilesWithOptions`. In the process to remove all AUTOUIC related code from `cmMakefile` for CMake 3.10, the pre filtered list was replaced by a loop in `cmQtAutoGeneratorInitializer` over all source files in the `cmMakefile`. This loop introduced the problem that file paths were computed for source files that weren't in the target's sources and that might not even have existed. If the path for an unused and not existing file was computed a `cmake::FATAL_ERROR` with the error message "Cannot find source file:" was thrown nevertheless. This caused some projects to fail in CMake 3.10. This patch adds a test for path errors in the loops in `cmQtAutoGeneratorInitializer` that iterate over all source files in a `cmMakefile`. If a path error appears, the file is silently ignored. If the file is part of the target's sources, the path error will still be caught in the loop over all the target's sources. This is the fix for CMake 3.10.1.
| * | | Autogen: Ignore not existing source files in cmMakefileSebastian Holtermann2018-01-101-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until CMake 3.10 a list of source files that had the AUTOUIC_OPTIONS property populated was kept in `cmMakefile::QtUiFilesWithOptions`. In the process to remove all AUTOUIC related code from `cmMakefile` for CMake 3.10, the pre filtered list was replaced by a loop in `cmQtAutoGeneratorInitializer` over all source files in the `cmMakefile`. This loop introduced the problem that file paths were computed for source files that weren't in the target's sources and that might not even have existed. If the path for an unused and not existing file was computed a `cmake::FATAL_ERROR` with the error message "Cannot find source file:" was thrown nevertheless. This caused some projects to fail in CMake 3.10. This patch adds a test for path errors in the loops in `cmQtAutoGeneratorInitializer` that iterate over all source files in a `cmMakefile`. If a path error appears, the file is silently ignored. If the file is part of the target's sources, the path error will still be caught in the loop over all the target's sources. Closes #17573 Closes #17589
* | | | Merge topic 'msvc-asm'Brad King2018-01-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c3f374e MSVC: Avoid warning when enabling ASM language with C compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1655
| * | | | MSVC: Avoid warning when enabling ASM language with C compilerBrad King2018-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMakeASMInformation` module warns when no compiler-specific module is found for the `ASM` language. Add a minimal `Compiler/MSVC-ASM` module to avoid the warning for MSVC. Fixes: #17532
* | | | | Merge topic 'specify-source-extensions'Brad King2018-01-113-25/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efd279cd cmake: specify source file extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1645
| * | | | | cmake: specify source file extensionsBen Boeckel2018-01-093-25/+27
| | | | | |
* | | | | | Merge topic 'misc-typos'Brad King2018-01-113-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d91b2d91 MAINT: Misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1654
| * | | | | | MAINT: Misc. typosluz.paz2018-01-103-3/+3
| | |/ / / / | |/| | | | | | | | | | Found via `codespell`
* | | | | | Merge topic 'cuda_msvc_support_complex_gencode_signatures'Brad King2018-01-113-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a91fde13 CUDA: gencode signature that list multiple code types now supported. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1618
| * | | | | | CUDA: gencode signature that list multiple code types now supported.Robert Maynard2018-01-103-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17263
* | | | | | | Merge topic 'FindBoost-1.66'Brad King2018-01-111-16/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6297d6c7 FindBoost: Generate imported targets for future Boost versions d56deff7 FindBoost: Search for upstream-packaged libs next to includes b044f69a FindBoost: Implement "Architecture and Address Model" tag b1e9f671 FindBoost: Fix incorrect alphabetisation of headers list 433a2d49 FindBoost: Boost 1.66.0 dependency and release update Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Merge-request: !1625
| * | | | | | | FindBoost: Generate imported targets for future Boost versionsPaul "TBBle" Hampson2018-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per discussion on cmake/cmake#17575, this protection not particularly valuable, as the dependency information which the imported targets wrap is generated anyway. This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to support newly-released Boost versions pending a new CMake release.
| * | | | | | | FindBoost: Search for upstream-packaged libs next to includesPaul "TBBle" Hampson2018-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream packages Boost binaries for Windows with the 'boost' directory (the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).
| * | | | | | | FindBoost: Implement "Architecture and Address Model" tagPaul "TBBle" Hampson2018-01-101-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tag is new in Boost 1.66.0, and is present in the 'versioned' library file name layout.
| * | | | | | | FindBoost: Fix incorrect alphabetisation of headers listPaul "TBBle" Hampson2018-01-101-1/+1
| | | | | | | |
| * | | | | | | FindBoost: Boost 1.66.0 dependency and release updatePaul "TBBle" Hampson2018-01-101-4/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release notes: http://www.boost.org/users/history/version_1_66_0.html * All new libraries are header-only. * _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1 * _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0
* | | | | | | Merge topic 'doc-fixes'Brad King2018-01-111-4/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da3a329a Linkify target_link_libraries in DEBUG_CONFIGURATIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1649
| * | | | | | | Linkify target_link_libraries in DEBUG_CONFIGURATIONSPaul "TBBle" Hampson2018-01-101-4/+3
| |/ / / / / /
* | | | | | | Merge topic 'doc-install-arg-order'Brad King2018-01-111-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f09fda97 Help: improve install() documentation of argument ordering Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1641
| * | | | | | | Help: improve install() documentation of argument orderingKyle Edwards2018-01-081-1/+15
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Fixes #16362.
* | | | | | | Merge topic 'findmpi-new-mpiexec-search'Christian Pfeiffer2018-01-111-15/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e9512a3 FindMPI: Move MSMPI/MPICH2 mpiexec search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1653
| * | | | | | | FindMPI: Move MSMPI/MPICH2 mpiexec searchChristian Pfeiffer2018-01-101-15/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic to search mpiexec for MSMPI and MPICH2 guesses to their respective guessing logic. This way, we can prevent mix ups between their mpiexecs and other potential matches, for example from an Intel MPI installation.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-01-111-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'release-3.10'Brad King2018-01-100-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'backport-kwiml-riscv' into release-3.10Brad King2018-01-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no corresponding merge request because this fix was cherry-picked specifically for CMake 3.10.
| | * | | | | | KWIML: Backport RISC-V update to CMake 3.10Brad King2018-01-091-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWIML commit 6fc81d8816 (abi.h: Update RISC-V support for revised macro names, 2017-12-30) to the CMake 3.10 release branch. The upstream RISC-V project changed some compiler symbols so `__riscv__` must now be renamed `__riscv`. Patch-by: Richard W.M. Jones <rjones@redhat.com>
* | | | | | | Merge topic 'unhardcode-configuration-types'Brad King2018-01-1032-411/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f4d7a07 Help: Add references and backticks in LINK_FLAGS prop_tgt 48f7e2d3 Unhardcode the CMAKE_CONFIGURATION_TYPES values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1345
| * | | | | | | Help: Add references and backticks in LINK_FLAGS prop_tgtBeren Minor2018-01-081-2/+3
| | | | | | | |
| * | | | | | | Unhardcode the CMAKE_CONFIGURATION_TYPES valuesBeren Minor2018-01-0832-410/+113
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes duplicated code for per-config variable initialization by providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)` function. This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT` and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every `<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or `CMAKE_BUILD_TYPE` for single-config generators.
* | | | | | | Merge topic 'serverTestInfoExpandVariables'Brad King2018-01-101-7/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c1ecab6 server: Expand generator expressions for test info Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1633
| * | | | | | | server: Expand generator expressions for test infoJustin Goshi2018-01-041-7/+18
| | | | | | | |
* | | | | | | | Merge topic 'update-kwiml'Brad King2018-01-105-9/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a53242d Merge branch 'upstream-KWIML' into update-kwiml 6e921648 KWIML 2018-01-09 (9c2d6cae) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1636
| * | | | | | | Merge branch 'upstream-KWIML' into update-kwimlBrad King2018-01-095-9/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWIML: KWIML 2018-01-09 (9c2d6cae)
| | * | | | | | | KWIML 2018-01-09 (9c2d6cae)KWIML Upstream2018-01-095-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit 9c2d6caecd8cd937b891009c681f90748df85dfd (master). Upstream Shortlog ----------------- Brad King (5): fc9d607a Use static_cast when compiling as C++ ea9336bc Update copyright year 7db8b884 Suppress MSVC static_cast warnings in verification and test code 340af24d Update copyright year 9c2d6cae Fix compilation on Borland C++ 5.8 Richard W.M. Jones (1): 6fc81d88 abi.h: Update RISC-V support for revised macro names
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'add_cuda_to_source_regex'Craig Scott2018-01-098-8/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81868e6b CUDA: Add cu as default source file extension Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1629
| * | | | | | | | | CUDA: Add cu as default source file extensionRobert Maynard2018-01-088-8/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.10'Brad King2018-01-090-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'FindPostgres_support_for_v10' into release-3.10Brad King2018-01-091-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1635
* | \ \ \ \ \ \ \ \ Merge topic 'FindPostgres_support_for_v10'Brad King2018-01-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9417a6d3 FindPostgreSQL: Add support for PG10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1635
| * | | | | | | | | FindPostgreSQL: Add support for PG10Egor Pugin2018-01-091-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge topic 'cpack_versions'Brad King2018-01-091-5/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4153640 Cpack.cmake: Document some CPACK_* default values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1608
| * | | | | | | | | Cpack.cmake: Document some CPACK_* default valuesHarry Mallon2017-12-201-5/+6
| | | | | | | | | |
* | | | | | | | | | Merge topic 'COMPILE_FLAGS-clarify-sf-prop-documentation'Brad King2018-01-091-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 118815f0 COMPILE_FLAGS: do not imply that the property is a list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1640
| * | | | | | | | | | COMPILE_FLAGS: do not imply that the property is a listBen Boeckel2018-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "added to the list" language hinted that the property was interpreted as a CMake list, but this is not correct. It is just a string.
generated by cgit v0.12 at 2025-09-11 02:12:45 (GMT)