Commit Graph

37439 Commits

Author SHA1 Message Date
Matthias Maennich
76c634c4ac clang-tidy: exclude 'modernize-return-braced-init-list' introduced in 5.0.0
Due to many occurrences and as I am not sure about the coding guide lines
in regards to this, I blacklist it.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-27 15:25:40 -04:00
Craig Scott
a2eec58dfa Merge topic 'document_env_variables'
e6b77c5f Help: Document CMake's environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1235
2017-09-27 09:01:35 -04:00
Brad King
825baaa1b3 Merge topic 'CMakeCPack-source-ignore'
fa23f66a CMakeCPack: Exclude version-control-specific files from source package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1314
2017-09-27 07:36:06 -04:00
Brad King
068effa4d8 Merge topic 'auto_ptr'
f0489856 Retire std::auto_ptr and its macro CM_AUTO_PTR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1300
2017-09-27 07:25:11 -04:00
Brad King
bb371753cb Merge topic 'vs-guid-tolerate-no-curly'
b3e6514c VS: Adapt project parsers to support "ProjectGUID" without curly brackets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1313
2017-09-27 07:23:51 -04:00
Brad King
2c50f7a795 Merge topic 'reduce-strcpy'
e43cb4c1 CursesDialog: avoid calling strcpy()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1311
2017-09-27 07:16:47 -04:00
Brad King
f9c619105c Merge topic 'GetPrerequisites-no-clear-on-missing'
1a7b8c83 GetPrerequisites: Restore behavior on missing binary of not clearing list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1312
2017-09-27 07:16:06 -04:00
Brad King
05e234cb16 Merge topic 'autogen-per-config-sources'
4603d6b0 Autogen: Docs: Add documentation internal links
f86ba8ee Autogen: Reintroduce per-config sources support
5d3bca64 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1307
2017-09-27 07:15:12 -04:00
Brad King
f75ac39692 Merge topic 'ninja-rc-depfile-quoting'
df965cb9 Ninja: Fix quoting of RC language depfile in cmcldeps call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1309
2017-09-27 07:14:17 -04:00
Brad King
c4d0939fba Merge topic 'FindOpenGL-glvnd'
e2e8a690 FindOpenGL: Add support for GLVND on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !782
2017-09-27 07:13:12 -04:00
Brad King
09350f19e0 Merge topic 'revert-perf-source-lookup'
a7005c98 Tests: Add case for legacy source file property behavior
1604716d Revert "Performance: Improve efficiency of source file lookup in cmMakefile"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1308
2017-09-27 07:11:07 -04:00
Brad King
f4517a4767 Merge branch 'release-3.9'
Use the "ours" merge strategy because we're merging a fixup that is
specific to the 3.9 branch and do not need the changes in `master`.
2017-09-27 06:14:38 -04:00
Brad King
d70ef7eff6 Merge branch 'FindBoost-fix-policy-scope' into release-3.9
This has no corresponding merge-request because the branch was
made as a direct fixup specific to 3.9.
2017-09-27 06:13:53 -04:00
Brad King
ed44b56a12 FindBoost: Finish reverting "Simplify search in lists" for 3.9
In commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.",
2017-09-05) we forgot to also revert commit commit v3.9.1~15^2
(FindBoost: pop policy stack before returning, 2017-07-24) which had
been made as a fixup to the original commit.

Fixes: #17309
2017-09-27 06:09:21 -04:00
Kitware Robot
4d0f040aa4 CMake Nightly Date Stamp 2017-09-27 00:01:04 -04:00
Fredrik Orderud
b3e6514c2a VS: Adapt project parsers to support "ProjectGUID" without curly brackets
This is needed to correctly parse Windows Installer "wiproj" projects,
that by default contain "ProjectGUID" tags with GUID values without
surrounding curly brackets.  Otherwise CMake truncates the first & last
character from the GUID value for these projects.
2017-09-26 08:56:20 -04:00
Brad King
fa23f66ad5 CMakeCPack: Exclude version-control-specific files from source package 2017-09-26 08:49:28 -04:00
Robert Maynard
e6b77c5f1a Help: Document CMake's environment variables 2017-09-26 08:44:45 -04:00
Brad King
c40d130034 Merge topic 'doc-MSVC_VERSION'
0741b6e2 Help: Update MSVC_VERSION documentation
00d9dd95 Help: Document MSVC_VERSION value 1911

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1310
2017-09-26 08:10:06 -04:00
Brad King
1a7b8c8321 GetPrerequisites: Restore behavior on missing binary of not clearing list
Prior to commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks
for execute_process() calls, 2015-07-29), `get_prerequisites` would
simply warn on a missing binary and not update the result list at all.
That commit accidentally made the case an error.  This was fixed by
commit v3.8.0-rc1~110^2 (GetPrerequisites: Do not fail on files we
cannot find, 2017-01-10), but the fix also cleared the result list.
Clearing the list is incorrect because it is supposed to be able to
accumulate results over multiple calls.

Remove the list clearing behavior to restore the original behavior on a
missing binary.

Fixes: #17306
2017-09-26 07:31:33 -04:00
Kitware Robot
ff76f89475 CMake Nightly Date Stamp 2017-09-26 00:01:22 -04:00
Matthias Maennich
f0489856e3 Retire std::auto_ptr and its macro CM_AUTO_PTR
Signed-off-by: Matthias Maennich <matthias@maennich.net>
2017-09-26 00:07:19 +02:00
Rolf Eike Beer
e43cb4c18a CursesDialog: avoid calling strcpy()
Also use memset() and a few places where the compiler will collapse the for
loop into such a call anyway.
2017-09-25 18:37:41 +02:00
Brad King
0741b6e226 Help: Update MSVC_VERSION documentation
Add the corresponding toolset name for each version.  While at it,
link to the general compiler version variable.
2017-09-25 11:44:12 -04:00
Wojciech Mamrak
00d9dd95af Help: Document MSVC_VERSION value 1911 2017-09-25 11:38:27 -04:00
Sebastian Holtermann
4603d6b082 Autogen: Docs: Add documentation internal links 2017-09-25 16:38:04 +02:00
Sebastian Holtermann
f86ba8ee8e Autogen: Reintroduce per-config sources support
Reintroduce per-config sources support in AUTOGEN but disable it by default.
2017-09-25 16:27:38 +02:00
Brad King
df965cb963 Ninja: Fix quoting of RC language depfile in cmcldeps call
Since commit v3.0.0-rc1~448^2 (Ninja: use deps = gcc/msvc feature,
2013-10-18) the value of the `DEP_FILE` binding already includes the
needed quoting to refer to the file.  However, that commit forgot to
update one of the `$DEP_FILE` references to not be quoted anymore.
The offending code path currently only affects cmcldeps for RC.
Remove the extra quoting now.

Fixes: #17298
2017-09-25 10:07:48 -04:00
Tom Fogal
e2e8a690cd FindOpenGL: Add support for GLVND on Linux
Find GLVND components if available.  Add `GLX` and `EGL` options for
COMPONENTS that allow requesting these libraries explicitly.  Introduce
new import targets for these windowing-system-specific libraries.

On a GLVND system, populate the legacy `OPENGL_LIBRARIES` variable and
the `OpenGL::GL` target using the `OpenGL` and `GLX` components.  On
non-GLVND systems, continue to use the legacy `GL` library and simply do
not provide the GLVND components.  Application code can choose to adapt
based on the availability of GLVND components as imported targets.
2017-09-25 09:22:29 -04:00
Brad King
a7005c985d Tests: Add case for legacy source file property behavior
The change in commit 3b95ab5693 (Performance: Improve efficiency of
source file lookup in cmMakefile, 2017-08-17) broke some legacy behavior
of source file properties in which the order sources are first resolved
with extensions affects how setting properties without extensions works.
It has been reverted for now, but the discovery was made after merging
because the broken case was not covered by our test suite.

Add a test case representing the legacy behavior.

Issue: #15208
2017-09-25 09:06:35 -04:00
Brad King
1604716dfc Revert "Performance: Improve efficiency of source file lookup in cmMakefile"
This reverts commit 3b95ab5693.
It regressed some legacy source file property behavior.
Revert pending further investigation.
2017-09-25 09:06:24 -04:00
Brad King
eae3765b67 Merge topic 'load_command-cleanup'
0332ec72 cmCPluginAPI: remove explicit casts to void*
cf399036 cmCPluginAPI: do not check pointer before calling free()
6e2b1853 cmCPluginAPI: use strdup() instead of open coding it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1305
2017-09-25 09:03:12 -04:00
Brad King
10fb805987 Merge topic 'FindOpenACC'
d3b6f291 FindOpenACC: Add module to detect compiler support for OpenACC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1209
2017-09-25 09:00:59 -04:00
Brad King
7c2979a5c5 Merge topic 'rc-missing-better-error'
0a8e23ad Windows: Improve link-time error messages when rc or mt fail
c2d6835c cmSystemTools: Teach RunSingleCommand another way to report exceptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1260
2017-09-25 09:00:16 -04:00
Brad King
62bdc587eb Merge topic 'cpackifw-options'
9a24ab6b CPackIFW: Add some options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1298
2017-09-25 08:58:25 -04:00
Brad King
f29b9702e0 Merge topic 'cxx17-no-bind1st'
44d3a76d Avoid using std::bind1st that is removed in C++17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1304
2017-09-25 08:57:41 -04:00
Brad King
bb535bedc0 Merge topic 'FindOpenMP-CMP0054'
dd5324ab FindOpenMP: Avoid CMP0054 warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1303
2017-09-25 08:56:00 -04:00
Brad King
6d20eda21a Merge topic 'test-fix-msvc-standard-default'
a5dd1599 Tests: Fix RunCMake.try_compile CxxStandard case on MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1302
2017-09-25 08:55:24 -04:00
Sebastian Holtermann
5d3bca6485 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator 2017-09-25 12:02:35 +02:00
Kitware Robot
f6f1b22987 CMake Nightly Date Stamp 2017-09-25 00:01:04 -04:00
Craig Scott
c3877b892a Merge topic '16839-better-tvos-support'
45e30d12 Xcode: Add team to compiler-id project
0be0e02c Xcode: Add tvOS and watchOS toolchain file support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1278
2017-09-24 08:02:57 -04:00
Kitware Robot
e2a57a438d CMake Nightly Date Stamp 2017-09-24 00:01:03 -04:00
Rolf Eike Beer
0332ec72b2 cmCPluginAPI: remove explicit casts to void* 2017-09-23 15:30:44 +02:00
Rolf Eike Beer
cf3990365a cmCPluginAPI: do not check pointer before calling free() 2017-09-23 15:30:44 +02:00
Rolf Eike Beer
6e2b18535b cmCPluginAPI: use strdup() instead of open coding it 2017-09-23 15:30:44 +02:00
Brad King
44d3a76d4a Avoid using std::bind1st that is removed in C++17
Use a lambda instead now that we require C++11.
2017-09-23 06:49:48 -04:00
Kitware Robot
7a7e96e278 CMake Nightly Date Stamp 2017-09-23 00:01:07 -04:00
Craig Scott
de5dd4f4fa Merge topic 'graphviz-link-type'
5b46cc91 graphviz: distinguish target dependency types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1229
2017-09-22 18:28:59 -04:00
Jonathan Marler
0a8e23ad6e Windows: Improve link-time error messages when rc or mt fail
We run extra tools during linking on Windows to deal with manifests.
Report more information when these tools fail.  For example, if the
Windows SDK is not installed with VS then `rc.exe` will be missing.
2017-09-22 13:57:08 -04:00
Brad King
dd5324ab1e FindOpenMP: Avoid CMP0054 warnings
When invoked in projects that don't set CMP0054 to NEW, FindOpenMP
triggers a warning:

    CMake Warning (dev) at .../Modules/FindOpenMP.cmake:... (if):
      Policy CMP0054 is not set...Quoted variables like "c" will no
      longer be dereferenced when the policy is set to NEW.  Since
      the policy is not set the OLD behavior will be used.

Set the policy within the module's scope to avoid this.

Fixes: #17292
2017-09-22 13:50:35 -04:00