37540 Commits

Author SHA1 Message Date
Yoshinori Tahara
04937db103 CSharp: Fix compiler version detection in non-English languages
When we run `csc.exe /help` we look for "Version" in the output.
Explicitly ask for the output in English.

Reported-by: guttally@users.noreply.github.com
2017-11-07 08:23:16 -05: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
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
Vitaly Stakhovsky
0b419b998d VS: Do not emit empty linker Version tag
This empty element does nothing, so simply remove it to simplify
generated `.vcxproj` files.
2017-10-03 08:27:46 -04:00
Brad King
046625d26f Merge topic 'FindProtobuf-gen-desc'
1299f4cc FindProtobuf: add flag to allow descriptor files to be generated
4e91be95 FindProtobuf: Refactor custom command output listing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1301
2017-10-03 08:14:34 -04:00
Stefan Andersson
1bdb8cd247 IAR: Detect compiler platform version
`__IAR_SYSTEMS_ICC__` provides additional version information that
we need to determine correct usage of the compiler.  Extract and
store it as `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL`.

Issue: #17264
2017-10-03 08:11:27 -04:00
Brad King
b96ca728f1 Add infrastructure to detect secondary compiler version information
Create a `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL` variable to hold
a secondary/internal compiler version number detected at the same
time as the primary compiler version.  This will be useful for some
compilers where we need such a number to determine correct usage.

Inspired-by: Stefan Andersson <tfosm@hotmail.com>
Suggested-by: Norbert Lange <norbert.lange@andritz.com>
Issue: #17264
2017-10-03 08:11:27 -04:00
Brad King
303cd7037a VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property
This already worked in other generators.  Also add a test case.

Fixes: #17314
2017-10-03 08:03:33 -04:00
Kitware Robot
6b2aad04e8 CMake Nightly Date Stamp 2017-10-03 00:01:03 -04:00
Brad King
f952f16d23 Help: Fix placement of one variable in cmake-variables manual
The `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` variable was recently
added slightly in the wrong place for the sorted ordering.
2017-10-02 11:40:40 -04:00
Brad King
db730f3e50 Merge topic 'file-path-checksum-cpp11'
23ad08dd Migrate cmFilePathChecksum to C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1334
2017-10-02 10:37:42 -04:00
Brad King
32a54d23c0 Merge topic 'cpack-dmg-explicit-hfs'
39b50975 CPack: Fix .dmg HFS+ creation on macOS APFS hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1335
2017-10-02 10:24:45 -04:00
Brad King
39b50975d9 CPack: Fix .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.
2017-10-02 10:09:37 -04:00
Peter Mitrano
1299f4cc5e FindProtobuf: add flag to allow descriptor files to be generated
- The .desc files will be in the same folder as the generated .cc and .h files.
- Paths to generate .desc files are stored in a variable passed in
- This is only implemented for C++
- Remove legacy ARGS
- Add test that generates and uses C++ protobuf message
- Add test that checks that the generated .desc file can be instantiated
  with DynamicMessageFactory
- Add Help rst for new feature
2017-10-02 08:08:24 -04:00
Brad King
4e91be9532 FindProtobuf: Refactor custom command output listing
Reduce duplication by storing the custom command outputs in variables.
Also, since custom command outputs are automatically marked as generated
we do not need to do so explicitly.
2017-10-02 08:04:24 -04:00
Brad King
a9870c9211 Merge topic 'DNDGen-stack-var'
ec30129b CPack: put local variable on the stack

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1331
2017-10-02 08:01:48 -04:00
Brad King
275b4a53ee Merge topic 'autogen-predefs'
6bbc1e77 Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
75c98b5e Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
1d7f099d Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1328
2017-10-02 08:01:21 -04:00
Brad King
9288c291cb Merge topic 'FindBoost-cmake-package'
c044b9ae FindBoost: Improve messages when a Boost CMake package is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1330
2017-10-02 07:58:08 -04:00
Brad King
90bd92ae88 Merge topic 'update-kwsys'
90f1b9ad Merge branch 'upstream-KWSys' into update-kwsys
4532b035 KWSys 2017-09-30 (f108739d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1333
2017-10-02 07:57:48 -04:00
Brad King
1f560b08d4 Merge topic 'cuda-9-tests'
aa640cc2 Tests: Fix CudaOnly.WithDefs test on CUDA 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1329
2017-10-02 07:57:20 -04:00
Kitware Robot
41bf791a68 CMake Nightly Date Stamp 2017-10-02 00:01:03 -04:00
Sebastian Holtermann
23ad08dd6c Migrate cmFilePathChecksum to C++11 2017-10-01 12:03:36 +02:00
Kitware Robot
dea0379a69 CMake Nightly Date Stamp 2017-10-01 00:01:02 -04:00
Brad King
90f1b9ad4e Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-09-30 (f108739d)
2017-09-30 10:07:56 -04:00
KWSys Upstream
4532b03572 KWSys 2017-09-30 (f108739d)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit f108739dd90f06787a955212cf475bbbb111252d (master).

Upstream Shortlog
-----------------

Brad King (1):
      41c93d97 Remove unnecessary testIOS

Rolf Eike Beer (2):
      caaef6bb testSystemTools: avoid strcpy()
      a5046656 SystemTool: remove unused Convert*MacroString()
2017-09-30 10:07:52 -04:00