Commit Graph

37562 Commits

Author SHA1 Message Date
Matthias Maennich
ff09abb8db cmLinkedTree: avoid unnecessary copies during Push of T 2017-10-09 10:23:14 +02:00
Kitware Robot
cb8f26f199 CMake Nightly Date Stamp 2017-10-09 00:01:03 -04:00
Kitware Robot
4e96dc02c3 CMake Nightly Date Stamp 2017-10-08 00:01:03 -04:00
Kitware Robot
720c217ed5 CMake Nightly Date Stamp 2017-10-07 00:01:04 -04:00
Brad King
60a7452811 Merge branch 'release-3.10' 2017-10-06 07:20:14 -04:00
Brad King
7a31da43b1 Merge branch 'findopenmp-fix-verbose' into release-3.10
Merge-request: !1348
2017-10-06 07:18:13 -04:00
Brad King
09a3a1cb9f Merge branch 'minor-fixes' into release-3.10
Merge-request: !1349
2017-10-06 07:18:01 -04:00
Brad King
7986103940 Merge topic 'minor-fixes'
b32b717b cmInstallCommandArguments: do not access static members through `this`
7eaa964e cmProcessTools: fix minor issue introduced by 595feb3
85a7eaba cmGeneratorTarget: remove dead code
3345e2a2 cmcmd: let operator<< for NumberFormatter reset the stream's format flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1349
2017-10-06 07:17:09 -04:00
Brad King
e67eb42fa1 Merge topic 'findopenmp-fix-verbose'
e25d88ec FindOpenMP: Fix link flags being used for compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1348
2017-10-06 07:15:24 -04:00
Kitware Robot
e1d6ede019 CMake Nightly Date Stamp 2017-10-06 00:01:04 -04:00
Christian Pfeiffer
e25d88ecb9 FindOpenMP: Fix link flags being used for compile
Fixes: #17307
2017-10-05 17:02:56 +02:00
Brad King
8e3b207ebb Merge branch 'release-3.10' 2017-10-05 10:54:33 -04:00
Brad King
4a4d62430b Merge topic 'cpack-dmg-explicit-hfs'
4f2a983c CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1354
2017-10-05 10:49:58 -04:00
Brad King
ecaddda2fe Merge branch 'cpack-dmg-explicit-hfs' into release-3.10
Merge-request: !1354
v3.10.0-rc1
2017-10-05 10:40:37 -04:00
Brad King
4f2a983c21 CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hosts
When running `hdiutil create`, specify the HFS+ filesystem explicitly.
Otherwise `hdiutil` may choose a filesystem based on the host.  We do
not want to create APFS images for `.dmg` packages because they may not
mount on macOS versions prior to 10.12.

This was missed in commit 39b50975d9 (CPack: Fix .dmg HFS+ creation on
macOS APFS hosts, 2017-10-02).

Reported-by: Alan Garny
2017-10-05 10:33:13 -04:00
Brad King
ba8aa6899d Begin post-3.10 development 2017-10-05 09:59:57 -04:00
Brad King
7f9783c2db Merge branch 'release-3.10' 2017-10-05 09:58:29 -04:00
Brad King
05373ee1a2 CMake 3.10.0-rc1 version update 2017-10-05 09:55:23 -04:00
Brad King
42d656b0b2 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2017-10-05 09:54:11 -04:00
Brad King
a91eb5e41f Merge topic 'doc-3.10-relnotes'
0565192a Help: Organize and revise 3.10 release notes
dd5835c0 Help: Consolidate 3.10 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1353
2017-10-05 09:52:34 -04:00
Brad King
f7d29c0b9a Merge topic 'xcode9-ios-tests'
d210b281 Xcode: Adjust tests to drop of 32bit iOS architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1347
2017-10-05 09:50:03 -04:00
Brad King
0565192aff Help: Organize and revise 3.10 release notes
Add section headers similar to the 3.9 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2017-10-05 09:24:08 -04:00
Matthias Maennich
b32b717b69 cmInstallCommandArguments: do not access static members through this 2017-10-05 14:53:52 +02:00
Matthias Maennich
7eaa964e9b cmProcessTools: fix minor issue introduced by 595feb3 2017-10-05 14:53:52 +02:00
Matthias Maennich
85a7eaba5e cmGeneratorTarget: remove dead code
explicitLibraries can never be nullptr at this point
2017-10-05 14:53:51 +02:00
Matthias Maennich
3345e2a2cc cmcmd: let operator<< for NumberFormatter reset the stream's format flags 2017-10-05 14:50:25 +02:00
Gregor Jasny
d210b28130 Xcode: Adjust tests to drop of 32bit iOS architectures 2017-10-05 14:10:28 +02:00
Brad King
dd5835c0d6 Help: Consolidate 3.10 release notes
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.10.rst`.
2017-10-05 08:00:03 -04:00
Brad King
4ffa4ddd80 Merge topic 'cuda-default-link-launcher'
7914fb82 CUDA: Fix default selection of host compiler used to drive linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1341
2017-10-05 07:36:53 -04:00
Brad King
69257d456a Merge topic 'FindCUDA-run_nvcc-CMP0007'
8b09c20c FindCUDA: Fix CMP0007 warning in run_nvcc.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1340
2017-10-05 07:36:03 -04:00
Brad King
b374ea86c6 Merge topic 'test-load_command-simplify'
e55d69cf Tests: Remove ancient workaround in LoadCommand tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1342
2017-10-05 07:35:32 -04:00
Brad King
dbb16722ee Merge topic 'find-matlab-r2017b'
f156b2fb FindMatlab: Add support for MATLAB 2017b

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !1343
2017-10-05 07:34:49 -04:00
Brad King
508f47de1b Merge topic 'findopenmp-fix-version'
31206157 FindOpenMP: Fix version if OpenMP doesn't work

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1344
2017-10-05 07:34:01 -04:00
Kitware Robot
78d4a3db03 CMake Nightly Date Stamp 2017-10-05 00:01:04 -04:00
Christian Pfeiffer
3120615739 FindOpenMP: Fix version if OpenMP doesn't work 2017-10-04 19:53:48 +02:00
Brad King
7914fb8223 CUDA: Fix default selection of host compiler used to drive linking
When no explicit `CMAKE_CUDA_HOST_COMPILER` is specified by the user
then we do not pass `-ccbin` to `nvcc`.  In this case, nvcc's link line
we extract during the compiler identification step may not have the
absolute path to the host compiler it uses to drive linking.  If it is
not absolute, use the `PATH=` from nvcc's output to search for it since
that is the one `nvcc` would use.

This fixes our internal `CMAKE_CUDA_HOST_LINK_LAUNCHER` value used to
construct link lines when using `CUDA` as the linker language.  It needs
to match the host compiler `nvcc` uses internally during compilation.

Fixes: #17323
2017-10-04 10:25:47 -04:00
Jamie Snape
f156b2fbfb FindMatlab: Add support for MATLAB 2017b 2017-10-04 09:47:46 -04:00
Brad King
e2f05c7310 Merge topic 'clang-format'
574d6943 clang-format.bash: minor fixes to support MacOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1339
2017-10-04 09:46:40 -04:00
Brad King
e55d69cf5a Tests: Remove ancient workaround in LoadCommand tests 2017-10-04 09:42:52 -04:00
Brad King
0e1ef0ca39 Merge branch 'release-3.9' 2017-10-04 09:05:03 -04:00
Umar Arshad
8b09c20c3a FindCUDA: Fix CMP0007 warning in run_nvcc.cmake
Set `CMP0007` to `NEW` for the entire script.  The script comes with
CMake and is aware of the policy's behavior, so set the policy to ensure
that its warnings do not show up during the build phase.

Fixes: #16579
2017-10-04 08:07:37 -04:00
Brad King
ddeabf05d8 CMake 3.9.4 v3.9.4 2017-10-04 07:44:08 -04:00
Brad King
1e38b99454 Merge topic 'test-macos-updates'
58d9297e Tests: Fix RunCMake.Framework ios arch for Xcode 9
b8dd7a70 Tests: Fix RunCMake.Framework expected output on macOS 10.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1338
2017-10-04 07:08:27 -04:00
Brad King
44d0e377f9 Merge topic 'vs-no-empty-link-version'
0b419b99 VS: Do not emit empty linker Version tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1332
2017-10-04 07:07:50 -04:00
Brad King
b320eb48f3 Merge topic 'compiler-version-internal'
1bdb8cd2 IAR: Detect compiler platform version
b96ca728 Add infrastructure to detect secondary compiler version information
f952f16d Help: Fix placement of one variable in cmake-variables manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1324
2017-10-04 07:07:09 -04:00
Brad King
8b5539d1c2 Merge topic 'src-flags-genex-target'
303cd703 VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nikita Nemkin <nikita@nemkin.ru>
Merge-request: !1336
2017-10-04 07:05:41 -04:00
Kitware Robot
19fce04713 CMake Nightly Date Stamp 2017-10-04 00:01:07 -04:00
Matthias Maennich
574d694337 clang-format.bash: minor fixes to support MacOS
- sed on Mac does not support embedded sed statements, hence eliminating
  the non-matches via grep

- xargs on Mac does not support -d, but does support -0, hence replacing
2017-10-03 22:16:07 +02:00
Brad King
58d9297eef Tests: Fix RunCMake.Framework ios arch for Xcode 9
Xcode 9 comes with the iPhoneOS 11.0 SDK that does not support the
`armv7` architecture.  For this SDK version and newer, use `arm64`.
2017-10-03 09:09:08 -04:00
Brad King
b8dd7a705c Tests: Fix RunCMake.Framework expected output on macOS 10.13
The archiver output in the case of universal binaries has changed
slightly.  Update our expected output to match.  While at it, drop
unnecessary leading and trailing `.*`.
2017-10-03 09:08:27 -04:00