Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King 0464298956 Merge topic 'arch-independent-version-file-creation'
eb973f935f CMakePackageConfigHelpers: Add ARCH_INDEPENDENT option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Silvio Traversaro <pegua1@gmail.com>
Merge-request: !2666
2018-12-06 09:00:58 -05:00
Brad King a722316bcb Merge topic 'autogen_uic_empty_fix'
5f0f84c7e0 Autogen: Don't add a WIN32 moc definition if we have a moc_predefs.h file
0814d74548 Autogen: Add QtAutogen.UicNoGui test
2ef640819f Autogen: Tests: Differentiate between Qt core and Qt gui tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2668
2018-12-06 08:57:59 -05:00
Brad King c0aab7a84a Merge topic 'cmcmd_touch_err'
100366a267 cmake: add error message when '-E touch' fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2671
2018-12-06 08:56:52 -05:00
Brad King fad7cfd464 Merge topic 'cpack-deb-tar-format'
38e75bb3c6 CPack/Deb: Remove paxr as a supported tar format for a .deb
0fc6faf2dd Help: Replace use of :code:`` with plain reST syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2651
2018-12-06 08:56:03 -05:00
Brad King cd4ac7235c Merge topic 'support_ewdk_install'
071c0e3ce4 cmVSSetupHelper: Support Enterprise WDK build enviornment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2658
2018-12-06 08:51:23 -05:00
Brad King eaac307aad Merge branch 'release-3.13' 2018-12-06 08:48:00 -05:00
Brad King 0780a8f57a Merge topic 'cuda-external'
7b74213461 CUDA: Fix crash on linking to a CUDA target without CUDA enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2704
2018-12-06 08:39:22 -05:00
Brad King 3542a553bf Merge topic 'update-kwsys'
014a098479 Merge branch 'upstream-KWSys' into update-kwsys
cbc772b89d KWSys 2018-11-28 (5ea12a52)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Isaiah <isaiah.norton@gmail.com>
Merge-request: !2678
2018-12-06 08:38:23 -05:00
Kitware Robot d8c6427fa1 CMake Nightly Date Stamp 2018-12-06 00:01:03 -05:00
Brad King 45c95a3327 Merge branch 'cuda-external' into release-3.13
Merge-request: !2704
2018-12-05 14:48:20 -05:00
Brad King 7b74213461 CUDA: Fix crash on linking to a CUDA target without CUDA enabled
Do not try to device link or add CUDA runtime libraries if the language
is not enabled.

Fixes: #18673
Issue: #18614
2018-12-05 14:45:19 -05:00
luz.paz 8adf237e52 Misc. comment typos
Found via `codespell`
2018-12-05 11:57:58 -05:00
Kitware Robot f92e953103 CMake Nightly Date Stamp 2018-12-05 00:01:04 -05:00
Kitware Robot b8db797ae3 CMake Nightly Date Stamp 2018-12-04 00:01:05 -05:00
Cristian Adam 243b7c40d4 QNX: Compiler and feature detection fixes
Tested compiler detection with the QNX 7.0 list of compiler targets:
 * gcc_ntoaarch64le
 * gcc_ntoaarch64le_cxx
 * gcc_ntoarmv7le
 * gcc_ntoarmv7le_cxx
 * gcc_ntox86_cxx
 * gcc_ntoaarch64le_gpp
 * gcc_ntox86_64_gpp
 * gcc_ntoarmv7le_gpp
 * gcc_ntox86_64_cxx
 * gcc_ntox86
 * gcc_ntox86_gpp
 * gcc_ntox86_64

This commit fixes some of the problems described in:
https://cristianadam.eu/20181202/a-better-qnx-cmake-toolchain-file/
2018-12-03 23:18:43 +01:00
Tobias Hunger 5191b74524 Autogen: Qt version detection cleanup
Split the Qt version detection code up a bit so that it is a bit
easier to follow.
2018-12-03 10:10:44 +01:00
JerryShih e9a1ddc594 FindThreads: Replace the pthread symbol checking in libc.
With asan build, we will have the pthread_create() symbol in libc. However,
libasan doesn't have full pthread implementation. We can't assume that we
have the pthread implementation in libc using pthread_create() symbol.
Replace the pthread_create() with pthread_kill() as a quick fix.
2018-12-03 16:05:59 +08:00
Kitware Robot 985a57a1c1 CMake Nightly Date Stamp 2018-12-03 00:01:03 -05:00
Kitware Robot 53fb6a1f50 CMake Nightly Date Stamp 2018-12-02 00:01:04 -05:00
Marc Chevrier f266182aec Check* functions family: add support for LINK_OPTIONS
Fixes: #18521
2018-12-01 17:56:23 +01:00
Marc Chevrier 29f9db5c63 try_compile/try_run: Add support for LINK_OPTIONS option. 2018-12-01 17:56:23 +01:00
Justin Bassett eb973f935f CMakePackageConfigHelpers: Add ARCH_INDEPENDENT option
Allow skipping the architecture check in the package version file generated from calling
write_basic_package_version_file. Document said architecture check.

Fixes: #16184
2018-11-30 22:52:40 -08:00
Kitware Robot 78c2edb129 CMake Nightly Date Stamp 2018-12-01 00:01:04 -05:00
Kitware Robot 654fdd8374 CMake Nightly Date Stamp 2018-11-30 00:01:04 -05:00
Kitware Robot 7bc72efb3c CMake Nightly Date Stamp 2018-11-29 00:01:04 -05:00
Regina Pfeifer 9501a6145d CTest: Remove special case for Dart version <= 1 2018-11-29 00:29:13 +01:00
Regina Pfeifer e184603378 CTest: Add release note about removed submission methods 2018-11-29 00:29:13 +01:00
Regina Pfeifer 8c25aa2feb CTest: Remove submission trigger 2018-11-29 00:29:13 +01:00
Regina Pfeifer a688c6b928 CTest: Remove submit method 'ftp' 2018-11-29 00:29:13 +01:00
Regina Pfeifer c339b64cf2 CTest: Remove submit method 'scp' 2018-11-29 00:29:13 +01:00
Regina Pfeifer aebdad399e CTest: Remove submit method 'cp' 2018-11-29 00:29:13 +01:00
Regina Pfeifer c2f6872c4e CTest: Remove submit method 'xmlrpc' 2018-11-29 00:29:12 +01:00
Brad King 7954ba9bc1 productbuild: escape pkg-ref urls
Inspired-by: James Goruk <james.goruk@gmail.com>
Fixes: #18645
2018-11-28 14:27:32 -05:00
Brad King 652210e901 cmSystemTools: Add EncodeURL helper
Factor a URL encoding implementation out of CTest.
Add an option to not escape slashes.

Suggested-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
2018-11-28 14:27:22 -05:00
Stephan Szabo 8107508b3e Remove old flag table headers 2018-11-28 07:43:31 -08:00
Stephan Szabo 6d855fbf44 Replace header flag tables with json reading
Stop loading flag tables from header files and instead load the flag table
information from json files in Templates/MSBuild/FlagTables.
2018-11-28 07:43:31 -08:00
Stephan Szabo 9c60ae5f11 VS: Add flag table entry for -JMC
Original header commit 516c6fc38c

Add support for mapping Just My Code compiler flag
2018-11-28 07:43:30 -08:00
Stephan Szabo 584ad067ba VS: Fix flag table entry for -Qspectre
The Qspectre option was generated by the script (as opposed to
being added by commit v3.13.0-rc1~4^2 (VS: Add flag table entry for
-Qspectre, 2018-10-08), however the comment was not useful and
there was a separate off option generated that was not in the
old table.
2018-11-28 07:43:30 -08:00
Stephan Szabo 8df25f9400 VS: connect /Y- compiler option with "Not Using Precompiled Headers"
Original header commit v3.10.0-rc1~423^2

The change allows to selectively disable PrecompiledHeaders.
Despite the `$(VCTargetsPath)/1033/cl.xml` contains an empty value for switch,
for effectively turn off setting need to use /Y- option as described on msdn:
https://msdn.microsoft.com/en-us/library/1hy7a92h.aspx
2018-11-28 07:43:30 -08:00
Stephan Szabo f1223e34c6 VS: Add v140 flag table entries for -Zc:inline[-]
Note: Zc:inline was added by generator, but not the - version.

Original header commit v3.7.2~8^2

The documentation of this option [1] claims that the default is off, but
VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData`
does not appear in the `.vcxproj` file.  Add the flag table entry to
allow use of the flag to be configured.

[1] https://msdn.microsoft.com/en-us/library/dn642448.aspx
2018-11-28 07:43:30 -08:00
Stephan Szabo efc90eed77 VS: Fix regressed mapping for the cl /Os compiler flag
Original header commit v3.6.0-rc3~8^2

In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct
compiler settings, 2016-02-18) a flag mapping was added for the clang
`-Os` flag.  However, this collides with a mapping we already had for
the MSVC flag of the same name.  This is a symptom of a larger problem
in that the VS generators need a per-toolset flag map (issue #16153).

For now, simply drop the new mapping and drop `-Os` from clang compiler
flags in the MinSizeRel configuration.
2018-11-28 07:43:30 -08:00
Stephan Szabo 36b7fc7db6 VS 14: Add flag map for -std= to CppLanguageStandard tag in project files
Original header commit v3.6.0-rc1~279^2~8

This is used by the Clang/C2 toolset.
2018-11-28 07:43:30 -08:00
Stephan Szabo 21d26a9ecd VS: in Clang/C2 toolset, setup correct compiler settings
Original header commit v3.6.0-rc1~279^2~10
2018-11-28 07:43:29 -08:00
Stephan Szabo 44dc9fc48a VS: Fix /analyze:log flag mapping (#14858)
Original header commits:
 v11/v12 commit v3.1.0-rc1~695^2
 v140/v141 commit v3.1.0-rc1~358^2~3

Fix the VS 11 and VS 12 flag table entries for this flag.  It requires
a value in the following argument.  Also drop the general "/analyze:"
flag table entry so that such flags will be passed through as plain
additional options.  This is necessary because some such options have
following values and some do not but not all have .vcxproj elements
to hold the values.
2018-11-28 07:43:29 -08:00
Stephan Szabo aba364d190 VS: Fix CSharp support for win32res: and win32icon: flags
Original header commit v3.13.0-rc2~6^2

Add a missing `:` to these entries in the flag table.  The user
value is always required and must come after the `:`.
2018-11-28 07:43:29 -08:00
Stephan Szabo b9fe2785f2 Vs: remove /nowin32manifest from C# flags to enable default VS behavior
Original header commit v3.10.0-rc1~494^2

if /nowin32manifest is specified, it will be preferred over any
occurring /win32manifest:<file> parameter
2018-11-28 07:43:29 -08:00
Stephan Szabo 6c6c13297c MSVC: Add support for ARM64 architecture
The v141_Link.json already appeared to have the option included, so
onlyh adding the change to v14_LIB.json.

Original header commit v3.10.0-rc1~132^2

Visual Studio 15.4 adds support for this architecture.
2018-11-28 07:43:29 -08:00
Stephan Szabo 454b47ba0b VS: Fix MANIFESTUAC link flag map to .vcxproj elements
Original header commit v3.10.0-rc1~97^2

Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order
to map them correctly to `.vcxproj` elements.

Keep the old incorrect flag table entries for `uiAccess` and `level`
flags for compatibility even though they do not really exist.

Fixes: #16563
2018-11-28 07:43:29 -08:00
Stephan Szabo 57a78b5526 VS: Fix support for '/guard:cf' linker flag
Original header commit v3.9.0-rc6~12^2

Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets
contains an entry for `LinkControlFlowGuard`, it does not work when used
in a `.vcxproj` file.  Drop our link flag table entries for these
toolsets so that the flag will be passed via `AdditionalOptions`.
2018-11-28 07:43:28 -08:00
Stephan Szabo f77320c12a VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULL
DEBUG:FULL was already added for v141 from the generation.

Original header commit v3.9.0-rc6~15^2
2018-11-28 07:43:28 -08:00