Commit Graph

43765 Commits

Author SHA1 Message Date
John Freeman
b7b7f1806a Help: Fix typo in install(EXPORT_ANDROID_MK) example 2019-05-26 09:09:07 -05:00
Craig Scott
902af25512 Help: Fix typo for CTEST_CUSTOM_WARNING_xxx vars
These variables apply to the `ctest_build` command, not `ctest_test`

Relates: #19217
2019-05-26 22:31:23 +10:00
Kitware Robot
63f149f598 CMake Nightly Date Stamp 2019-05-26 00:01:04 -04:00
Kitware Robot
e32f839338 CMake Nightly Date Stamp 2019-05-25 00:01:11 -04:00
Saleem Abdulrasool
abea06efdf Modules: setup CMAKE_Swift_LINKER_PREFERENCE
Swift's driver will invoke the C++ driver (`clang++`) to invoke the
linker.  Additionally, it will configure the command line to deal with
the linkage runtime support object (`swiftrt.o` or `swiftrt.obj`) to be
added at the right time (similar to C/C++).  Since it indirects through
`clang++` it will properly setup the linker invocation for C++ and C as
well.  This should permit the correct linker driver to be invoked in
multi-language projects.

Closes #19299
2019-05-24 10:33:25 -07:00
Christian Pfeiffer
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates
Fixes: #19289
2019-05-24 19:01:28 +02:00
Marc Chevrier
62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup. 2019-05-24 18:44:43 +02:00
Brad King
4ec2b99941 Merge topic 'selective-tar-extracting-and-listing'
c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3342
2019-05-24 10:43:14 -04:00
Brad King
2b8e5a3ba7 Merge topic 'ninja-pool-link-doc-nit'
25b2c7e4cd Help/CMAKE_JOB_POOL_LINK: match the header line with the variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3369
2019-05-24 10:41:48 -04:00
Brad King
3b7894b96c Merge topic 'fix-armclang-policy'
32e4f236b7 ARMClang: fix policy manipulation in the compiler module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3365
2019-05-24 10:40:39 -04:00
Brad King
96189e99e1 Merge topic 'cmAppend'
006229278b Use cmAppend to append ranges to std::vector instances
999516478d cmAlgorithms: Add cmAppend function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3366
2019-05-24 10:39:01 -04:00
Brad King
96a013d44c Merge topic 'cmTargetMap_definition'
7b4b61a4d3 cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3364
2019-05-24 10:37:38 -04:00
Brad King
ff0fb58fb5 Merge topic 'update-curl'
90766347db curl: Update build within CMake to account for 7.65 changes
a39138ef9a Merge branch 'upstream-curl' into update-curl
b26487c663 curl 2019-05-22 (885ce314)
2de8af0121 curl: Update script to get curl 7.65.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3363
2019-05-24 10:36:24 -04:00
Brad King
59c392b44e FindICU: Pass explicit NAMES argument to find command calls
This improves readability and avoids an undocumented signature variant.

Fixes: #19302
2019-05-24 10:31:35 -04:00
Brad King
9bf97363b0 Utilities/Release: Replace upload step with a "push" script
Replace the `upload_release.cmake` script with a `push.bash` script
that is more configurable from the command line and that does not
hard-code any destinations.  Instead of using `scp` to access
`cmake.org` directly, push the files atomically to a staging
directory from which another process will actually upload them.
2019-05-24 09:51:25 -04:00
Ben Boeckel
25b2c7e4cd Help/CMAKE_JOB_POOL_LINK: match the header line with the variable 2019-05-24 09:31:56 -04:00
Brad King
3a0ab3ba23 Utilities/Release: Teach upload script to compute version automatically
Read the version from `Source/CMakeVersion.cmake` instead of repeating it.
2019-05-24 08:04:11 -04:00
Brad King
2b6f832bf5 Merge branch 'FindBoost-contract-requires-compile-features' into release-3.14
Merge-request: !3368
2019-05-24 07:15:31 -04:00
Alex Turbov
b915a42585 FindBoost: Add compiler features for Boost Contract library 2019-05-24 07:13:56 -04:00
Brad King
74829f01b1 Help: Add notes for topic 'clang-gnulike-support' 2019-05-24 08:43:56 +02:00
Zsolt Parragi
19669abe1d Tests: handle string escaping differences with NMake+clang 2019-05-24 08:43:55 +02:00
Zsolt Parragi
a2a90f41e3 Tests: require C++14 for the Tutorial
Clang++ on Windows with the MSVC STL requires C++14 to compile.
The C++ standard is set to C++14 for the entire tutorial instead of
MSVC/clang specific conditions to keep it simple.
2019-05-24 08:43:55 +02:00
Zsolt Parragi
4819ff9647 Tests: fix failures with gnu mode clang on windows
Root causes were:
    * Using incorrect conditions (assuming MSVC-like command line mode)
    * Trying to compile the MSVC STL in C++11 mode, when parts of it require
      C++14 or enabling MS extensions in clang.
    * Missing flush in a testcase using stdout in a dll and a main part
    with static crt
2019-05-24 08:43:42 +02:00
Kitware Robot
c22693b99d CMake Nightly Date Stamp 2019-05-24 00:01:06 -04:00
Zsolt Parragi
26af0b25e7 cmake: use correct stack size with gnu mode clang on windows 2019-05-23 23:35:42 +02:00
Zsolt Parragi
d44c0db0b2 clang: setup correct configuration in gnu mode 2019-05-23 23:35:33 +02:00
Saleem Abdulrasool
9e5457d3b4 Ninja,Swift: correct response file handling
The response file was being written but not used due to the wrong
variable being configured for Swift.  Swift does compile+link in a
single phase and does not use the `<OBJECTS>` placeholder.  Use the
`<SWIFT_SOURCES>` placeholder instead for the response file substitution
which serves the same purpose.
2019-05-23 14:05:37 -07:00
Sebastian Holtermann
006229278b Use cmAppend to append ranges to std::vector instances 2019-05-23 16:19:49 +02:00
Bartosz Kosiorek
c8e217e0a7 cmake: tar: Allow selective extracting and listing of archives 2019-05-23 10:08:22 -04:00
Sebastian Holtermann
999516478d cmAlgorithms: Add cmAppend function
The new `cmAppend` function simplifies appending ranges of values to a
`std::vector`.
2019-05-23 15:32:23 +02:00
Brad King
f03a80aefd Merge topic 'genex-target-property-lifetime'
5a1af142f1 Genex: Fix value lifetimes in nested TARGET_PROPERTY evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3362
2019-05-23 09:22:37 -04:00
Ben Boeckel
32e4f236b7 ARMClang: fix policy manipulation in the compiler module
Policies have their own scoping and cannot be set within a function
without affecting callers.
2019-05-23 09:19:59 -04:00
Ben Boeckel
3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach 2019-05-23 09:15:04 -04:00
Brad King
a4faf7788c Merge topic 'string-error'
e884b1b693 cmSystemTools::Error(): remove const char* overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3360
2019-05-23 09:05:47 -04:00
Brad King
22df62b58d Merge topic 'swift-flag-variables'
24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags
7e636fd8e0 Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG`
0fbf936b46 Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3353
2019-05-23 09:02:55 -04:00
Brad King
4f739a4e47 Merge topic 'compiler-launcher-shell-format'
8ee6584a99 Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3361
2019-05-23 09:01:04 -04:00
Brad King
5222400d9f Merge topic 'FindPython-find_strategy'
8517b549f4 FindPython: Add policy to manage lookup stratgey default.
9f205acefe FindPython: Implement lookup strategies.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3354
2019-05-23 08:59:25 -04:00
Brad King
cbd1c5b4ab Merge topic 'framework-var'
26ea022c3b Add variable CMAKE_FRAMEWORK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3347
2019-05-23 08:57:36 -04:00
Brad King
79c6a573f4 Merge topic 'swift-flags'
02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3355
2019-05-23 08:55:16 -04:00
Brad King
d1a570f18c Merge topic 'cmFileTimes'
5b53cfda24 cmSystemTools: Remove cmSystemToolsFileTime interface
9c576a88d9 Use cmFileTimes instead of cmSystemToolsFileTime interface
4b45a5d5c7 cmFileTimes: New RAII based cmFileTimes class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3358
2019-05-23 08:53:17 -04:00
Brad King
d7e70d01fe Merge topic 'autogen_compiler_features'
71d6a1455e Autogen: Evaluate compiler features for the same exectuable only once

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3359
2019-05-23 08:51:38 -04:00
Sebastian Holtermann
7b4b61a4d3 cmMakefile: Define cmTargetMap type in cmMakefile instead of cmTarget
The `cmTargetMap` type is only used in the context of `cmMakefile`.
Therefore it is the most appropriate place to declare it.

This moves the `cmTarget.h/cmTargets` type definition to
`cmMakefile::cmTargetMap`.
2019-05-23 13:00:33 +02:00
Kitware Robot
22d58e07e5 CMake Nightly Date Stamp 2019-05-23 00:01:09 -04:00
Brad King
90766347db curl: Update build within CMake to account for 7.65 changes 2019-05-22 14:22:22 -04:00
Brad King
a39138ef9a Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
Curl Upstream
b26487c663 curl 2019-05-22 (885ce314)
Code extracted from:

    https://github.com/curl/curl.git

at commit 885ce31401b6789c959131754b1e5ae518964072 (curl-7_65_0).
2019-05-22 14:11:40 -04:00
Brad King
2de8af0121 curl: Update script to get curl 7.65.0 2019-05-22 14:11:29 -04:00
Vitaly Stakhovsky
e884b1b693 cmSystemTools::Error(): remove const char* overload 2019-05-22 10:51:06 -04:00
Brad King
8ee6584a99 Ninja,Makefile: Fix <LANG>_COMPILER_LAUNCHER shell command syntax
The first entry in the compiler launcher command argument list is
the command itself and should be converted to the shell's native
command syntax (e.g. backslashes on Windows).

Without this, the `RunCMake.CompilerLauncher` test fails on Windows
when there are *no* spaces in the path to `cmake.exe`.
2019-05-22 10:47:15 -04:00
Brad King
8ed6efbbd3 Merge topic 'default-generator-env'
d0f0ba0f7a Tests: Add environment generator tests
a48ce8f4bf Help: Add documentation for default generator environment variables
083cf7e8a2 cmake: Allow default generator to be set by environment variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3218
2019-05-22 10:32:43 -04:00