mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,074 Commits 2 Branches 391 Tags
d41abae70f282c718f3109b7f76644adce41ff37
Commit Graph

39074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
d41abae70f Merge topic 'list-join' 
a58158727b list(): add `JOIN` sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1846
 2018-03-20 09:40:40 -04:00
Marc Chevrier
a58158727b list(): add JOIN sub-command 2018-03-20 14:28:17 +01:00
Brad King
3b99c9689a Merge topic 'FindwxWidgets-msvc-v141' 
73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1861
 2018-03-20 09:21:49 -04:00
Brad King
157ae9a088 Merge topic 'make_GetItems_const' 
8e20ad1a5e cmComputeLinkInformation: make GetItems() const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1863
 2018-03-20 09:21:02 -04:00
Brad King
f5f992b6f0 Merge topic 'vs-indentfix' 
b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1868
 2018-03-20 09:19:26 -04:00
Kitware Robot
5831b6a2ae CMake Nightly Date Stamp 2018-03-20 00:01:08 -04:00
Adam Oleksy
73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset 
Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141
toolset, 2017-03-22) more MSVC updates have been released that use a
MSVC_VERSION value higher than 1910.  Revise our checks accordingly.

Issue: #16735
 2018-03-19 11:56:00 -04:00
Brad King
882ba7fd11 Merge topic 'doc-set_target_properties-clarify' 
89ee7ce3ea Help: Reference set_property from set_target_properties
c27e3e0f2b Help: Clarify that set_target_properties supports multiple targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1866
 2018-03-19 11:18:31 -04:00
Brad King
7ba6f40bb2 Merge branch 'release-3.11' 2018-03-19 10:43:56 -04:00
Vitaly Stakhovsky
b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation 
Added printing empty string to get the right indentation.
 2018-03-19 09:56:44 -04:00
Brad King
6b9172d759 CMake 3.11.0-rc4 v3.11.0-rc4 2018-03-19 09:25:26 -04:00
Brad King
d8826406aa Merge branch 'release-3.11' 2018-03-19 09:24:37 -04:00
Brad King
e35f4014f6 Merge topic 'revert-findqt4-dirs-fix' 
cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1867
 2018-03-19 09:22:53 -04:00
Brad King
c78d12fc0d Merge branch 'revert-findqt4-dirs-fix' into release-3.11 
Merge-request: !1867
 2018-03-19 09:17:09 -04:00
Brad King
cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty" 
The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS
dir even if empty, 2017-11-19) regressed existing builds on some
machines.  Revert it for CMake 3.11 pending further investigation.

Fixes: #17814, #17817
Issue: #14155, #17492
 2018-03-19 09:13:25 -04:00
Michael Stürmer
8e20ad1a5e cmComputeLinkInformation: make GetItems() const 2018-03-19 09:07:38 -04:00
Brad King
180a36e243 Merge topic 'find-package_root-restore' 
eb35d8884b find_package: Use PackageName_ROOT variables as search prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1858
 2018-03-19 08:30:05 -04:00
Brad King
cded54f48d Merge topic 'doc-list-command' 
81226c73a4 Help: refresh list() command documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1860
 2018-03-19 08:28:51 -04:00
Brad King
20fc763b32 Merge topic 'export-properties' 
6db61f0725 Export: allow exporting of additional properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1834
 2018-03-19 08:28:14 -04:00
Brad King
c3b95b5a9a Merge topic 'codelite-project-settings' 
334c8ba7a4 CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output path
acd322ebe4 CodeLite: Use project Makefile instead of workspace Makefile.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1840
 2018-03-19 08:27:14 -04:00
Brad King
60299bc6f0 Merge topic 'vs-debugger-command' 
5a7113d8fb VS: Add target property VS_DEBUGGER_COMMAND

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1842
 2018-03-19 08:26:33 -04:00
Brad King
360886b180 Merge topic 'vs10-cmelem' 
a74d5a5c8b cmVisualStudio10TargetGenerator: improved XML nesting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1849
 2018-03-19 08:25:49 -04:00
Brad King
5b78ed5770 Merge branch 'release-3.11' 2018-03-19 08:18:20 -04:00
Brad King
cc2e5709ed Merge topic 'intel-initializer-list' 
fc96d99c3e Features: Record initializer list support for Intel 14 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1855
 2018-03-19 08:17:18 -04:00
Brad King
89ee7ce3ea Help: Reference set_property from set_target_properties 2018-03-19 08:05:29 -04:00
Brad King
c27e3e0f2b Help: Clarify that set_target_properties supports multiple targets 
Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
 2018-03-19 07:44:42 -04:00
Kitware Robot
dfc9036bcf CMake Nightly Date Stamp 2018-03-19 00:01:08 -04:00
Kitware Robot
6aab885c92 CMake Nightly Date Stamp 2018-03-18 00:01:15 -04:00
Craig Scott
80784ef77f Merge topic 'project-homepage-url' 
73f9b2974c project: Add HOMEPAGE_URL named parameter
fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION
9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION
c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1816
 2018-03-17 18:24:44 -04:00
Kitware Robot
c824b6c667 CMake Nightly Date Stamp 2018-03-17 00:01:12 -04:00
Alex Turbov
73f9b2974c project: Add HOMEPAGE_URL named parameter 
This sets variables like PROJECT_HOMEPAGE_URL, which can be
used as default values for various things (packaging modules,
doxygen defaults, etc.). Some packaging modules have been
updated to do this as part of this commit.

Co-Author: Craig Scott <craig.scott@crascit.com>
 2018-03-17 08:25:48 +11:00
Craig Scott
fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION 
For consistency with the VERSION keyword, also define the
<PROJECT-NAME>_DESCRIPTION variable.
 2018-03-17 08:25:48 +11:00
Craig Scott
9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION 2018-03-17 08:25:48 +11:00
Marc Chevrier
81226c73a4 Help: refresh list() command documentation 
Reformat `list` command documentation be consistent with the `string`
command.
 2018-03-16 15:28:14 +01:00
Brad King
eb35d8884b find_package: Use PackageName_ROOT variables as search prefixes 
This feature was originally added by commit v3.9.0-rc1~71^2~2 (find_*:
Add a new PackageRoot search path group, 2017-05-03) and documented by
commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path
group, 2017-05-03).  However, we had to disable the feature and remove
the documentation in commit v3.9.1~2^2 (find_*: Disable the PACKAGE_ROOT
search path group for CMake 3.9, 2017-08-08) due to breaking projects
that used `PackageName_ROOT` variables themselves.

Add policy `CMP0074` to restore the `PackageName_ROOT` variable behavior
in a compatible way.  Also revise the stack of root paths to store the
paths themselves rather than the package names.  This way the policy can
be considered at the `find_package` call site instead of individual
`find_` calls inside a find module.

Co-Author: Chuck Atkins <chuck.atkins@kitware.com>
Issue: #17144
 2018-03-16 09:19:28 -04:00
Wouter Klouwen
6db61f0725 Export: allow exporting of additional properties 
This change introduces an additional property that may be set on a
target to allow additional properties to be exported. Normally only a
limited number of properties are exported.

Additional properties may be exported by simply setting the
`EXPORT_PROPERTIES` property on a target that is exported.
 2018-03-16 09:00:56 -04:00
Vitaly Stakhovsky
a74d5a5c8b cmVisualStudio10TargetGenerator: improved XML nesting 
Introduce an `Elem` helper class to track XML element state.  This
simplifies code in a few places, particularly OutputSourceSpecificFlags.
 2018-03-16 08:50:19 -04:00
Brad King
b3e668ea25 Merge branch 'release-3.10' 2018-03-16 08:39:53 -04:00
Brad King
4e9aa80158 Merge branch 'intel-initializer-list' into release-3.11 
Merge-request: !1855
 2018-03-16 07:53:36 -04:00
Brad King
f919600ed6 Merge branch 'release-3.11' 2018-03-16 07:52:47 -04:00
Brad King
df27bd3f83 Merge branch 'gtest_discover_tests_timeout' into release-3.11 
Merge-request: !1851
 2018-03-16 07:52:23 -04:00
Brad King
fc96d99c3e Features: Record initializer list support for Intel 14 and above 
Features recorded by commit v3.6.0-rc1~120^2~5 (Features: Record
standards and features for Intel C++ on UNIX, 2016-04-28) for the Intel
compiler left out initializer list support because our test case in
`Tests/CompileFeatures/cxx_generalized_initializers.cpp` caused an
internal compiler error.  It turns out this is because the Intel
compiler asserts the `initializer_list` constructor signatures to verify
that they match its own `<initializer_list>` header.  It was our dummy
implementation used to test the language feature without any headers
that caused the ICE.  Revise it to use a constructor signature accepted
by the Intel compiler.

Fixes: #17829
 2018-03-16 07:47:42 -04:00
Brad King
e4a0d8f399 CMake 3.10.3 v3.10.3 2018-03-16 07:34:34 -04:00
Brad King
5eb20f66ec Merge branch 'release-3.10' 2018-03-16 07:29:11 -04:00
Brad King
30b7c40ad8 Merge topic 'gtest_discover_tests_timeout' 
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
 2018-03-16 07:27:16 -04:00
Kitware Robot
43e8e0b688 CMake Nightly Date Stamp 2018-03-16 00:01:12 -04:00
Brad King
018946aaaf Merge topic 'clarify-contributing-doc' 
27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Merge-request: !1845
 2018-03-15 07:58:33 -04:00
Jean-Christophe Fillion-Robin
27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base 2018-03-15 07:56:30 -04:00
Brad King
2ab900c71b Merge topic 'compile-options-shell' 
ce0b983216 target_compile_options: Add syntax to specify shell strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1841
 2018-03-15 07:55:14 -04:00
Brad King
6723261931 Merge branch 'release-3.11' 2018-03-15 07:53:35 -04:00