summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* install,export: Maybe transform OBJECT libraries to INTERFACE librariesBrad King2018-02-2823-63/+123
| | | | | | | | | | | Teach the `install` and `export` commands to support installing and exporting `OBJECT` libraries without their object files. Transform them to `INTERFACE` libraries in such cases. For `install(TARGETS)`, activate this when no destination for the object files is specified. For `export`, activate this only under Xcode with multiple architectures when we have no well-defined object file locations to give to clients.
* CMake Nightly Date StampKitware Robot2018-02-141-1/+1
|
* Merge topic 'more-misc-typos'Brad King2018-02-139-16/+16
|\ | | | | | | | | | | | | 193082a3 MAINT: Misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1758
| * MAINT: Misc. typosluz.paz2018-02-139-16/+16
| | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt`.
* | Merge branch 'release-3.11'Brad King2018-02-130-0/+0
|\ \
| * \ Merge branch 'autogen-write-on-change-only' into release-3.11Brad King2018-02-131-34/+12
| |\ \ | | | | | | | | | | | | Merge-request: !1753
| * \ \ Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11Brad King2018-02-131-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1754
| * \ \ \ Merge branch '17711-reset-xcode-target-var' into release-3.11Brad King2018-02-131-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1757
* | \ \ \ \ Merge topic '17711-reset-xcode-target-var'Brad King2018-02-131-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4349393d cmGlobalXCodeGenerator: Properly initialize TARGETS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1757
| * | | | | cmGlobalXCodeGenerator: Properly initialize TARGETS variableGregor Jasny2018-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17711
* | | | | | Merge topic 'autogen-write-on-change-only'Brad King2018-02-131-34/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c85ef9c3 Autogen: Overwrite info files when changed only Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'FindImageMagick-FixFor7.0.x'Brad King2018-02-131-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 91785239 FindImageMagick: Add 7.0 library names Acked-by: Kitware Robot <kwrobot@kitware.com> 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_`.
* | | | CMake Nightly Date StampKitware Robot2018-02-131-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-121-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-111-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-091-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2018-02-081-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-02-071-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-02-061-1/+1
| | |
* | | Begin post-3.11 developmentBrad King2018-02-053-2/+11
| | |
* | | Merge branch 'release-3.11'Brad King2018-02-054-13/+4
|\ \ \ | |/ / |/| / | |/
| * 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.
* | | | Merge topic 'test-cuda-missing-check'Brad King2018-02-021-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8285aa9e Tests: Add missing error check in CudaOnly.GPUDebugFlag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !1739
| * | | | Tests: Add missing error check in CudaOnly.GPUDebugFlagBrad King2018-02-011-0/+5
| |/ / / | | | | | | | | | | | | If `cudaMallocManaged` fails then later use of `has_debug` is not valid.
* | | | Merge topic 'ninja-unused-device-link'Brad King2018-02-021-28/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20676cba Ninja: Remove unused device link line code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1737
| * | | | Ninja: Remove unused device link line codeBrad King2018-02-011-28/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `PRE_LINK` and `POST_BUILD` variables. They are not referenced by `WriteDeviceLinkRule`. Remove the `byproducts` local variable from `WriteDeviceLinkStatement` and all the code populating it. We never used the result.