mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-14 11:09:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,766 Commits 2 Branches 390 Tags
d870148537319da2e86237cbd8baf6815975e594
Commit Graph

38766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
d870148537 CMake Nightly Date Stamp 2018-02-14 00:01:12 -05:00
Brad King
58c637643d Merge topic 'more-misc-typos' 
193082a3 MAINT: Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1758
 2018-02-13 11:28:31 -05:00
luz.paz
193082a3c8 MAINT: Misc. typos 
Found via `codespell -q 3 -I ../cmake-whitelist.txt`.
 2018-02-13 11:24:30 -05:00
Brad King
3b8b379852 Merge branch 'release-3.11' 2018-02-13 11:18:35 -05:00
Brad King
16c6764f9b Merge topic '17711-reset-xcode-target-var' 
4349393d cmGlobalXCodeGenerator: Properly initialize TARGETS variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1757
 2018-02-13 11:17:25 -05:00
Brad King
31550ebf31 Merge topic 'autogen-write-on-change-only' 
c85ef9c3 Autogen: Overwrite info files when changed only

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1753
 2018-02-13 11:12:14 -05:00
Brad King
210a80f48d Merge topic 'FindImageMagick-FixFor7.0.x' 
91785239 FindImageMagick: Add 7.0 library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1754
 2018-02-13 11:08:38 -05:00
Brad King
43cd9467cd Merge branch 'autogen-write-on-change-only' into release-3.11 
Merge-request: !1753
 2018-02-13 11:05:11 -05:00
Brad King
101ef67b99 Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11 
Merge-request: !1754
 2018-02-13 11:03:55 -05:00
Brad King
2a730e24c6 Merge branch '17711-reset-xcode-target-var' into release-3.11 
Merge-request: !1757
 2018-02-13 11:03:15 -05:00
Gregor Jasny
4349393d1d cmGlobalXCodeGenerator: Properly initialize TARGETS variable 
Fixes: #17711
 2018-02-13 11:02:24 -05:00
Kitware Robot
ab8416776d CMake Nightly Date Stamp 2018-02-13 00:01:07 -05:00
Kitware Robot
0465d3c204 CMake Nightly Date Stamp 2018-02-12 00:01:11 -05:00
Kitware Robot
e24cda008e CMake Nightly Date Stamp 2018-02-11 00:01:05 -05:00
Kitware Robot
1f39bfad47 CMake Nightly Date Stamp 2018-02-10 00:01:12 -05:00
Kitware Robot
b0c3696205 CMake Nightly Date Stamp 2018-02-09 00:01:06 -05:00
Kitware Robot
1da3f3e916 CMake Nightly Date Stamp 2018-02-08 00:01:12 -05:00
Kitware Robot
5656ebc87c CMake Nightly Date Stamp 2018-02-07 00:01:05 -05:00
Roman Wüger
9178523968 FindImageMagick: Add 7.0 library names 
For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and
`CORE_RL_MagickCore_`.
 2018-02-06 14:54:33 -05:00
Sebastian Holtermann
c85ef9c339 Autogen: Overwrite info files when changed only 
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.
 2018-02-06 11:20:08 -05:00
Kitware Robot
f7c08c333b CMake Nightly Date Stamp 2018-02-06 00:01:07 -05:00
Brad King
f211193afe Begin post-3.11 development 2018-02-05 11:40:43 -05:00
Brad King
363770f5f6 Merge branch 'release-3.11' 2018-02-05 11:39:26 -05:00
Brad King
51b287c40c CMake 3.11.0-rc1 version update 2018-02-05 11:16:50 -05:00
Brad King
e29df9924a Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2018-02-05 11:15:14 -05:00
Brad King
9c1efb614d Merge topic 'doc-3.11-relnotes' 
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
 2018-02-05 11:14:31 -05:00
Brad King
acbbccf704 Help: Organize and revise 3.11 release notes 
Add section headers similar to the 3.10 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2018-02-05 10:56:36 -05:00
Brad King
22ac06edb8 Help: Consolidate 3.11 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.11.rst`.
 2018-02-05 09:32:26 -05:00
Brad King
a40768b5af Merge topic 'bootstrap-try-clang' 
04167e39 bootstrap: Add Clang to known compiler candidates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1749
 2018-02-05 09:28:01 -05:00
Axel Huebl
04167e39c3 bootstrap: Add Clang to known compiler candidates 
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.
 2018-02-05 08:58:41 -05:00
Brad King
fba5980fa6 Merge topic 'fix_help_cmake_parse_arguments' 
b95eda9b Help: Fix code example in cmake_parse_arguments.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1747
 2018-02-05 08:47:36 -05:00
Brad King
213ecf05d6 Merge topic 'autogen-improve-multi-config' 
a8ee7406 Autogen: Improved multi-config include scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1735
 2018-02-05 08:43:05 -05:00
Brad King
e559b45ff8 Merge topic 'autogen-documentation' 
c4ffbb79 Autogen: Documentation: Update for AUTORCC changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1744
 2018-02-05 08:42:33 -05:00
Brad King
4d9ccd0abd Merge topic 'vs-static-ConvertToWindowsSlash' 
6d148d6d cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1741
 2018-02-05 08:41:52 -05:00
Kitware Robot
30ee1dc7b0 CMake Nightly Date Stamp 2018-02-05 00:01:09 -05:00
Kai Wolf
b95eda9b11 Help: Fix code example in cmake_parse_arguments.rst 2018-02-04 08:41:03 +01:00
Kitware Robot
b4a06e2cf7 CMake Nightly Date Stamp 2018-02-04 00:01:09 -05:00
Sebastian Holtermann
c4ffbb79c0 Autogen: Documentation: Update for AUTORCC changes 2018-02-03 10:12:01 +01:00
Kitware Robot
09d7ed20df CMake Nightly Date Stamp 2018-02-03 00:01:12 -05:00
Brad King
b12069f7b0 Merge topic 'UseSWIG-fix-regression' 
bc3697fa UseSWIG: Restore support for like-named .i files in different modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1734
 2018-02-02 07:58:11 -05:00
Marc Chevrier
bc3697fa51 UseSWIG: Restore support for like-named .i files in different modules 
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
 2018-02-02 07:41:44 -05:00
Brad King
457bcbd4f9 Merge topic 'simplify-ccg-converter' 
df1693bd cmCustomCommandGenerator: Simplify cmOutputConverter access

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1738
 2018-02-02 07:24:07 -05:00
Brad King
62c5fc80b1 Merge topic 'test-cuda-missing-check' 
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
 2018-02-02 07:23:38 -05:00
Brad King
52ed76e46e Merge topic 'ninja-unused-device-link' 
20676cba Ninja: Remove unused device link line code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1737
 2018-02-02 07:23:08 -05:00
Brad King
d280327713 Merge topic 'update-kwsys' 
be46f9fb Merge branch 'upstream-KWSys' into update-kwsys
854feacc KWSys 2018-02-01 (04fcc449)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1736
 2018-02-02 07:22:40 -05:00
Sebastian Holtermann
a8ee7406a7 Autogen: Improved multi-config include scheme 
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
 2018-02-02 09:10:40 +01:00
Kitware Robot
a53697acc7 CMake Nightly Date Stamp 2018-02-02 00:01:06 -05:00
Vitaly Stakhovsky
6d148d6d53 cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash() 
It is no longer used outside this class, so its scope can be limited to file.
 2018-02-01 19:09:34 -05:00
Brad King
df1693bdfc cmCustomCommandGenerator: Simplify cmOutputConverter access 
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.
 2018-02-01 14:58:25 -05:00
Brad King
20676cbaca Ninja: Remove unused device link line code 
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.
 2018-02-01 14:36:09 -05:00