summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Do not pass unsupported @rspfile arguments to NVCCBrad King2018-03-071-0/+6
| | | | | | | The nvcc compiler does not support `@<rspfile>` arguments. It does offer a `--options-file` argument that can be investigated later. Fixes: #17797
* CMake 3.11.0-rc2v3.11.0-rc2Brad King2018-02-271-1/+1
|
* Merge branch 'modules-restore-path-suffixes' into release-3.11Brad King2018-02-264-0/+11
|\ | | | | | | Merge-request: !1802
| * Modules: Restore recently removed search path suffixesBrad King2018-02-264-0/+11
| | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
* | Merge branch 'unixtimefix' into release-3.11Brad King2018-02-262-4/+4
|\ \ | | | | | | | | | Merge-request: !1800
| * | Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1Bernhard M. Wiedemann2018-02-262-4/+4
| |/ | | | | | | | | | | | | | | The test was expecting timestamps on day 1 in 1970 to start at 86400 but they actually started at 0. This worked without `SOURCE_DATE_EPOCH=1` because after 1972, leap days compensated the offset. Fixes: #17762
* | Merge branch '14297-partial-xcode-zero-check' into release-3.11Brad King2018-02-235-1/+26
|\ \ | | | | | | | | | Merge-request: !1790
| * | Xcode: Generate ZERO_CHECK generator target only onceGregor Jasny2018-02-225-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled generate only the root-level ZERO_CHECK target so targets in subdirectories pick up the root generator target of ZERO_CHECK. For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not enabled more investigation and a proper and final fix is still needed. Issue: 14297
* | | Merge branch 'std-thread-link' into release-3.11Brad King2018-02-222-0/+3
|\ \ \ | |/ / |/| | | | | Merge-request: !1789
| * | CMakeLib: Link to system thread libraries to support std::threadBrad King2018-02-222-0/+3
| |/ | | | | | | | | | | | | | | | | Some environments require linking to thread libraries for `std::thread`. Express this direct dependency of CMakeLib explicitly. Previously this was done indirectly through our bundled libuv, but that does not work when using a system libuv. Fixes: #17757
* | Merge branch 'test-CompileFeatures-c11-range' into release-3.11Brad King2018-02-211-1/+1
|\ \ | | | | | | | | | Merge-request: !1785
| * | Tests: Make CompileFeatures C dialect check consistent with implBrad King2018-02-211-1/+1
| |/ | | | | | | | | | | | | | | `Modules/CMakeCCompilerId.c.in` will report the C dialect as 11 whenever `__STDC_VERSION__` indicates *at least* C 11. Make the test consistent with this. We already do this for the C++ case. Fixes: #17740
* | Merge branch 'autogen-depend-filters-documentation' into release-3.11Brad King2018-02-212-26/+99
|\ \ | | | | | | | | | Merge-request: !1782
| * | Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentationSebastian Holtermann2018-02-211-18/+77
| | |
| * | Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentationSebastian Holtermann2018-02-211-8/+22
| |/
* | Merge branch 'ti-depfile-flag-fix' into release-3.11Brad King2018-02-201-1/+1
|\ \ | | | | | | | | | Merge-request: !1774
| * | Compiler/TI: Fix depfile generation for C++Grzegorz Dobinski2018-02-201-1/+1
| |/ | | | | | | | | | | | | | | In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile generation for Ninja, 2017-10-16) the flag for C++ was added in a variable with a typo in its name. Fix the spelling. Issue: #17360
* | Merge branch 'help_fixup' into release-3.11Brad King2018-02-162-2/+2
|\ \ | | | | | | | | | Merge-request: !1770
| * | Help: Fix command references in CMAKE_NETRC* variable documentationShane Parris2018-02-162-2/+2
| |/
* | Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-152-13/+17
|\ \ | | | | | | | | | Merge-request: !1766
| * | Android.mk: Fix export of static libraries with PRIVATE dependenciesBrad King2018-02-142-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | The `LINK_ONLY` generator expression is used to represent private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` property value. Fix evaluation of generator expressions during export to support the `LINK_ONLY` genex. Extend the RunCMake.AndroidMK test with a case for this.
| * | Android.mk: Evaluate generator expressions up frontBrad King2018-02-141-12/+13
| |/ | | | | | | | | | | When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator expressions first, before expanding the `;` list, in case they contain or generate semicolons.
* | Merge branch 'autogen-write-on-change-only' into release-3.11Brad King2018-02-131-34/+12
|\ \ | | | | | | | | | Merge-request: !1753
| * | Autogen: Overwrite info files when changed onlySebastian Holtermann2018-02-061-34/+12
| |/ | | | | | | | | | | Check if the content of the AUTOMOC/UIC/RCC info file will change before overwriting it. This avoids unnecessary AUTORCC rebuilds when AUTORCC unrelated CMake settings change.
* | Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11Brad King2018-02-131-2/+2
|\ \ | | | | | | | | | Merge-request: !1754
| * | FindImageMagick: Add 7.0 library namesRoman Wüger2018-02-061-2/+2
| |/ | | | | | | | | For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and `CORE_RL_MagickCore_`.
* | Merge branch '17711-reset-xcode-target-var' into release-3.11Brad King2018-02-131-0/+1
|\ \ | | | | | | | | | Merge-request: !1757
| * | cmGlobalXCodeGenerator: Properly initialize TARGETS variableGregor Jasny2018-02-131-0/+1
| |/ | | | | | | Fixes: #17711
* | CMake 3.11.0-rc1 version updateBrad King2018-02-052-4/+4
| |
* | Help: Drop development topic notes to prepare releaseBrad King2018-02-052-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.11-relnotes'Brad King2018-02-0540-308/+279
|\ | | | | | | | | | | | | | | acbbccf7 Help: Organize and revise 3.11 release notes 22ac06ed Help: Consolidate 3.11 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1751
| * Help: Organize and revise 3.11 release notesBrad King2018-02-051-159/+197
| | | | | | | | | | Add section headers similar to the 3.10 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.11 release notesBrad King2018-02-0540-308/+241
|/ | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.11.rst`.
* Merge topic 'bootstrap-try-clang'Brad King2018-02-051-2/+2
|\ | | | | | | | | | | | | 04167e39 bootstrap: Add Clang to known compiler candidates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1749
| * bootstrap: Add Clang to known compiler candidatesAxel Huebl2018-02-051-2/+2
| | | | | | | | | | | | Add `clang` and `clang++` after the corresponding `gcc` and `g++` candidates. Otherwise it is not tried on platforms where we do not enumerate the toolchain pair candidates.
* | Merge topic 'fix_help_cmake_parse_arguments'Brad King2018-02-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | b95eda9b Help: Fix code example in cmake_parse_arguments.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1747
| * | Help: Fix code example in cmake_parse_arguments.rstKai Wolf2018-02-041-1/+1
| | |
* | | Merge topic 'autogen-improve-multi-config'Brad King2018-02-0510-510/+421
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a8ee7406 Autogen: Improved multi-config include scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1735
| * | | Autogen: Improved multi-config include schemeSebastian Holtermann2018-02-0210-510/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators AUTOMOC generates the moc files that are included in `mocs_compilation.cpp` in `AUTOGEN_BUILD_DIR/include_$<CONFIG>/`. By doing so each configuration reads different moc files when compiling `mocs_compilation.cpp`. Since we do not (need to) rewrite `mocs_compilation.cpp` on a configuration change anymore, the files also does not need to be recompiled anymore. Not having to rewrite and recompile `mocs_compilation.cpp` on a configuration change anymore was the main objective of this patch. In a similar fashion AUTORCC generates a `qrc_BASE_CMAKE.cpp` file below `AUTOGEN_BUILD_DIR/include_$<CONFIG>/` and `qrc_BASE.cpp` becomes a mere wrapper that includes this actuall rcc output file (when using multi configuration generators). The template files `Modules/AutoRccInfo.cmake.in` and `Modules/AutogenInfo.cmake.in` were removed in favor of writing the info `.cmake` files manually. Closes #17230
* | | | Merge topic 'autogen-documentation'Brad King2018-02-052-11/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4ffbb79 Autogen: Documentation: Update for AUTORCC changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1744
| * | | | Autogen: Documentation: Update for AUTORCC changesSebastian Holtermann2018-02-032-11/+13
| | | | |
* | | | | Merge topic 'vs-static-ConvertToWindowsSlash'Brad King2018-02-052-51/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d148d6d cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1741
| * | | | | cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash()Vitaly Stakhovsky2018-02-022-51/+52
| | |/ / / | |/| | | | | | | | | | | | | It is no longer used outside this class, so its scope can be limited to file.
* | | | | CMake Nightly Date StampKitware Robot2018-02-051-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2018-02-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-031-1/+1
| |/ / |/| |
* | | Merge topic 'UseSWIG-fix-regression'Brad King2018-02-021-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bc3697fa UseSWIG: Restore support for like-named .i files in different modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1734
| * | | UseSWIG: Restore support for like-named .i files in different modulesMarc Chevrier2018-02-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 2ee10119ea (swig: fix incremental build in case of removed interface files, 2017-11-06). Name the extra targets added for Makefile generators using both the module name and .i base name to avoid collisions across modules. Also make sure the extra targets added for all .i files in a module are added as dependencies instead of just the last one. Fixes: #17704
* | | | Merge topic 'simplify-ccg-converter'Brad King2018-02-021-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df1693bd cmCustomCommandGenerator: Simplify cmOutputConverter access Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1738
| * | | | cmCustomCommandGenerator: Simplify cmOutputConverter accessBrad King2018-02-011-3/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~480^2~3 (cmCustomCommandGenerator: Port to cmOutputConverter, 2015-06-04), cmCustomCommandGenerator's access to the local generator was removed so it needed to construct its own cmOutputConverter instance. Access to the local generator was then restored by commit v3.4.0-rc1~285^2~21 (cmCustomCommandGenerator: Require cmLocalGenerator in API, 2015-07-25), so now we can use its cmOutputConverter base class methods directly.
generated by cgit v0.12 at 2025-09-09 08:31:43 (GMT)