Commit Graph

40734 Commits

Author SHA1 Message Date
Kitware Robot
8bb0e09e38 CMake Nightly Date Stamp 2018-09-28 00:01:10 -04:00
Brad King
3f7312a978 Merge topic 'asm-path-from-c'
7ab5843c26 ASM: Search for full path even when using C or C++ compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2418
2018-09-27 14:51:13 -04:00
Brad King
abe25dd79f Merge topic 'update-libarchive'
6744e44970 Update CMake pre-cached values for libarchive 3.3.3
6a4b1006f9 Merge branch 'upstream-LibArchive' into update-libarchive
2aaed7a050 LibArchive 2018-09-03 (5fe69dd0)
710f37c47a libarchive: Update script to get 3.3.3
97e1213a88 Merge branch 'libarchive-libressl-2.7' into update-libarchive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2417
2018-09-27 14:50:14 -04:00
Brad King
6eea9677f1 Merge branch 'release-3.12' 2018-09-27 14:49:09 -04:00
Brad King
e9f656da82 Merge topic 'libarchive-libressl-2.7'
e7e88e955b libarchive: Backport fix for build with LibreSSL 2.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2416
2018-09-27 14:48:50 -04:00
Brad King
acf0627470 Merge topic 'FindMatlab-2018b'
62709beff8 FindMatlab: Add Matlab 2018a,b to version list
9a56ed3438 FindMatlab: Explicitly export mexFunction in MSVC
6c57f6b347 FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !2407
2018-09-27 14:48:03 -04:00
Kitware Robot
be1ceda97f CMake Nightly Date Stamp 2018-09-27 00:01:09 -04:00
Raul Laasner
7ab5843c26 ASM: Search for full path even when using C or C++ compiler
When `CMAKE_{C,CXX}_COMPILER` is set but `CMAKE_ASM*_COMPILER` is
not, we copy the C or C++ compiler to use as the ASM compiler.
In this case we still need to search for the ASM compiler in case
the C or C++ compiler is not known as an absolute path.

Also do not copy the compiler id setting and let the normal detection
take place.  The C compiler id may not exist if the language has not
been enabled.

Fixes: #18406
2018-09-26 14:01:39 -04:00
Michael Wegner
b3d5b8b3fb ctest: Add option for live progress summary in terminal 2018-09-26 11:47:49 -04:00
Brad King
a57225c4fc Merge topic 'FindLua-names-per-dir'
98dfdab19c FindLua: Search for all library names in each path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Merge-request: !2412
2018-09-26 10:07:01 -04:00
Brad King
c813785044 Merge topic 'FindGLUT-windows-debug'
0da645d452 FindGLUT: Find debug/release variants on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2398
2018-09-26 10:06:21 -04:00
Brad King
5f702f97a8 Merge topic 'refactor-backtrace'
3c8187f687 clang-tidy: restore 'misc-noexcept-move-constructor'
6c2af9d302 cmListFileCache: Add missing assertion in backtrace Top method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2415
2018-09-26 10:01:09 -04:00
Brad King
6744e44970 Update CMake pre-cached values for libarchive 3.3.3
The ENABLE_LZ4 option was added.
2018-09-26 09:55:09 -04:00
Brad King
6a4b1006f9 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2018-09-03 (5fe69dd0)
2018-09-26 09:53:15 -04:00
LibArchive Upstream
2aaed7a050 LibArchive 2018-09-03 (5fe69dd0)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 5fe69dd018745a88eecf1f7db40daf12d26f7ed0 (v3.3.3).
2018-09-26 09:52:15 -04:00
Brad King
710f37c47a libarchive: Update script to get 3.3.3 2018-09-26 09:52:01 -04:00
Brad King
97e1213a88 Merge branch 'libarchive-libressl-2.7' into update-libarchive 2018-09-26 09:51:12 -04:00
Brad King
a9694d6538 Merge branch 'libarchive-libressl-2.7' into release-3.12
Merge-request: !2416
2018-09-26 09:50:43 -04:00
Brad King
e7e88e955b libarchive: Backport fix for build with LibreSSL 2.7
Backport libarchive commit v3.3.3~16^2 (fix build with LibreSSL 2.7,
2018-04-01).  LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on
method names.

Fixes: #18404
2018-09-26 09:47:53 -04:00
Craig Scott
3181f8405b Merge topic 'link-directories'
f9717725f9 link_directories(): enhance capabilities
b5915744eb LINK_DIRECTORIES target property: add policy for absolute paths check.
a71caab46b LINK_DIRECTORIES: Add new properties and commands
5ca130e223 Refactoring: introduce function to check if a string is a generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2403
2018-09-26 08:11:40 -04:00
Sean Warren
62709beff8 FindMatlab: Add Matlab 2018a,b to version list 2018-09-26 07:54:50 -04:00
Sean Warren
9a56ed3438 FindMatlab: Explicitly export mexFunction in MSVC
Fixes: #18391
2018-09-26 07:54:01 -04:00
Sean Warren
6c57f6b347 FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArray
Fixes: #17971
2018-09-26 07:53:50 -04:00
Gilles Khouzam
22282d6931 Tests: Add VSWinStore* test for VS 2017 ARM64 2018-09-26 06:57:43 -04:00
Gilles Khouzam
57b9a072cb Tests: Teach VSWinStore* tests to pass the architecture as a parameter
Instead of specifying the architecture in the generator name, pass it as
the generator platform.  This has been preferred since CMake 3.1.
2018-09-26 06:57:04 -04:00
Brad King
b16b254845 Merge topic 'dbgsym-packaging'
d8a3939aef CPack/Deb: Add ability to split out debug symbols into .ddeb package
42fbff45e4 CPack/Deb: Use CMAKE_COMMAND to set the environment
66ab24a4c5 Help: Fix typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2399
2018-09-26 06:52:06 -04:00
Brad King
71a68ece89 Merge topic 'rel-linux64'
830d4760db Utilities/Release: Build with gcc 8.2 on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2414
2018-09-26 06:50:19 -04:00
Brad King
3c8187f687 clang-tidy: restore 'misc-noexcept-move-constructor'
We disabled this in commit 1fe0d72eb6 (clang-tidy: exclude
'misc-noexcept-move-constructor', 2018-09-24) due to false positives.
Restore it and use a NOLINT comment to suppress them instead.
2018-09-26 06:38:52 -04:00
Brad King
6c2af9d302 cmListFileCache: Add missing assertion in backtrace Top method
We can only get the top of a stack that has at least one call.
Update the method's comment accordingly.
2018-09-26 06:32:21 -04:00
Kitware Robot
5abe45270e CMake Nightly Date Stamp 2018-09-26 00:01:09 -04:00
Brad King
830d4760db Utilities/Release: Build with gcc 8.2 on Linux
Also add a binutils-2.31 to CMAKE_PREFIX_PATH in the environment so that
tests that look for them with `find_program` can find a newer version.
This is needed for the build id support in readelf.
2018-09-25 16:53:11 -04:00
Brad King
98e4fbdc06 VS: Pass platform when invoking MSBuild
MSBuild expects a `/p:Platform=...` argument to tell it which platform
to build among those in the `.vcxproj` files.  We have not historically
had to do this because we generate only one platform.  However, when
a project uses `include_external_msproject` the included project file
may have other platforms.

Fixes: #18308
2018-09-25 13:27:13 -04:00
Brad King
6597428c36 ctest: Fix generator platform under --build-nocmake
When constructing a global generator instance in `--build-and-test` mode
we need to set the platform passed by `--build-generator-platform`
directly on the generator.  The old code that set it on the `cmake`
class instance did nothing because that only affects cache
initialization, which is not done by `--build-nocmake`.
2018-09-25 13:27:11 -04:00
Brad King
d8294fefe8 cmake: Fix generator platform under --build mode 2018-09-25 13:27:08 -04:00
Marc Chevrier
f9717725f9 link_directories(): enhance capabilities 2018-09-25 23:59:59 +10:00
Marc Chevrier
b5915744eb LINK_DIRECTORIES target property: add policy for absolute paths check. 2018-09-25 23:59:59 +10:00
Marc Chevrier
a71caab46b LINK_DIRECTORIES: Add new properties and commands
These new capabilities enable to manage link directories

Two new properties:
* target properties: LINK_DIRECTORIES and INTERFACE_LINK_DIRECTORIES

One new command
* target_link_directories(): to populate target properties

Fixes: #17215
2018-09-25 23:59:58 +10:00
Marc Chevrier
5ca130e223 Refactoring: introduce function to check if a string is a generator expression 2018-09-25 23:46:56 +10:00
Brad King
98dfdab19c FindLua: Search for all library names in each path
Add the `NAMES_PER_DIR` option to our `find_library` call so that all
names are considered in each path as we proceed through the search.
This allows locally-built unversioned libraries to be found before
versioned system libraries if they appear earlier in the set of paths to
be searched.

Suggested-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
2018-09-25 09:32:45 -04:00
Mikhail Korolev
22e670a306 VS: Add option to set VS_GLOBAL_* for all targets
Fixes: #18287
2018-09-25 09:20:25 -04:00
Kohányi Róbert
0da645d452 FindGLUT: Find debug/release variants on Windows
* Separate find_library calls to find Release and Debug libs.
* Using select_library_configurations to properly populate required
  variables (similar to FindZLIB).
* Setting Release and Debug specific properties
  (IMPORTED_CONFIGURATIONS_<CONFIG> and IMPORTED_LOCATION_<CONFIG>).
* Falling back to setting just IMPORTED_LOCATION if
  GLUT_glut_LIBRARY_RELEASE or GLUT_glut_LIBRARY_DEBUG are not defined.

This enables proper linking on Windows.

Fixes: #17037
2018-09-25 09:00:54 -04:00
Brad King
55a5b56e08 Merge topic 'refactor-backtrace'
22aa6b67b4 cmListFileCache: Refactor cmListFileBacktrace internals
1fe0d72eb6 clang-tidy: exclude 'misc-noexcept-move-constructor'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2410
2018-09-25 08:41:49 -04:00
Brad King
65f8eb5ae5 Merge topic 'doc-vs-cmake-A'
15e211df80 Help: Suggest using -A to specify platform for VS generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2411
2018-09-25 08:39:46 -04:00
Michael Wegner
62fbe5002a cmCTestRunTest: Thread number of completed tests through start APIs 2018-09-25 08:20:57 -04:00
Michael Wegner
02c5091c90 cmCTestRunTest: Simplify number width computation
Use a real logarithm implementation.
2018-09-25 08:20:57 -04:00
Michael Wegner
6a285bb737 cmCTestRunTest: Buffer test result output before printing 2018-09-25 08:20:57 -04:00
Brad King
15e211df80 Help: Suggest using -A to specify platform for VS generators
We already suggest `-T` for the toolset.  Create a dedicated section for
platform selection and suggest `-A`.  Provide examples.
2018-09-25 06:52:35 -04:00
Kitware Robot
1fea56c3bd CMake Nightly Date Stamp 2018-09-25 00:01:13 -04:00
Brad King
22aa6b67b4 cmListFileCache: Refactor cmListFileBacktrace internals
Replace use of raw pointers and explicit reference counting with
`std::shared_ptr<>`.  Use a discriminated union to store either the
bottom level or a call/file context in each heap-allocated entry.
This avoids storing a copy of the bottom in every `cmListFileBacktrace`
instance and shrinks the structure to a single `shared_ptr`.
2018-09-24 17:29:15 -04:00
Brad King
1fe0d72eb6 clang-tidy: exclude 'misc-noexcept-move-constructor'
Our installation is producing false positives on move constructors
and assignment operators that are clearly marked `noexcept`.
2018-09-24 17:29:15 -04:00