Gregor Jasny
78a560e42b
Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"
...
This reverts commit d210b28130
2017-10-10 09:08:44 -04:00
Gregor Jasny
d210b28130
Xcode: Adjust tests to drop of 32bit iOS architectures
2017-10-05 14:10:28 +02:00
Kitware Robot
78d4a3db03
CMake Nightly Date Stamp
2017-10-05 00:01:04 -04:00
Brad King
e2f05c7310
Merge topic 'clang-format'
...
574d6943kwrobot@kitware.com >
Merge-request: !1339
2017-10-04 09:46:40 -04:00
Brad King
0e1ef0ca39
Merge branch 'release-3.9'
2017-10-04 09:05:03 -04:00
Brad King
ddeabf05d8
CMake 3.9.4
2017-10-04 07:44:08 -04:00
Brad King
1e38b99454
Merge topic 'test-macos-updates'
...
58d9297eb8dd7a70kwrobot@kitware.com >
Merge-request: !1338
2017-10-04 07:08:27 -04:00
Brad King
44d0e377f9
Merge topic 'vs-no-empty-link-version'
...
0b419b99kwrobot@kitware.com >
Merge-request: !1332
2017-10-04 07:07:50 -04:00
Brad King
b320eb48f3
Merge topic 'compiler-version-internal'
...
1bdb8cd2b96ca728f952f16dkwrobot@kitware.com >
Merge-request: !1324
2017-10-04 07:07:09 -04:00
Brad King
8b5539d1c2
Merge topic 'src-flags-genex-target'
...
303cd703kwrobot@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'
...
1299f4cc4e91be95kwrobot@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'
...
23ad08ddkwrobot@kitware.com >
Merge-request: !1334
2017-10-02 10:37:42 -04:00
Brad King
32a54d23c0
Merge topic 'cpack-dmg-explicit-hfs'
...
39b50975kwrobot@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'
...
ec30129bkwrobot@kitware.com >
Merge-request: !1331
2017-10-02 08:01:48 -04:00
Brad King
275b4a53ee
Merge topic 'autogen-predefs'
...
6bbc1e7775c98b5e1d7f099dkwrobot@kitware.com >
Merge-request: !1328
2017-10-02 08:01:21 -04:00
Brad King
9288c291cb
Merge topic 'FindBoost-cmake-package'
...
c044b9aekwrobot@kitware.com >
Merge-request: !1330
2017-10-02 07:58:08 -04:00
Brad King
90bd92ae88
Merge topic 'update-kwsys'
...
90f1b9ad4532b035kwrobot@kitware.com >
Merge-request: !1333
2017-10-02 07:57:48 -04:00
Brad King
1f560b08d4
Merge topic 'cuda-9-tests'
...
aa640cc2kwrobot@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
Kitware Robot
5dd75e3595
CMake Nightly Date Stamp
2017-09-30 00:01:04 -04:00
Rolf Eike Beer
ec30129b41
CPack: put local variable on the stack
2017-09-29 21:11:53 +02:00
Brad King
c044b9ae84
FindBoost: Improve messages when a Boost CMake package is found
...
Add a test for this case to verify the messages. This test will also be
valuable to cover this code path in which we've had several regressions
recently.
2017-09-29 10:10:01 -04:00
Brad King
aa640cc20f
Tests: Fix CudaOnly.WithDefs test on CUDA 9
...
CUDA 9 dropped support for `compute_20`, so use a different alternative.
2017-09-29 09:55:11 -04:00
Sebastian Holtermann
6bbc1e775d
Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
2017-09-29 15:32:10 +02:00
Brad King
6bced4bf76
Merge topic 'cuda_9_support'
...
fe37b994kwrobot@kitware.com >
Merge-request: !1315
2017-09-29 09:23:39 -04:00
Sebastian Holtermann
75c98b5ef4
Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
...
Also adds the documentation for CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND.
Closes #17275
2017-09-29 15:00:47 +02:00
Sebastian Holtermann
1d7f099d9c
Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
2017-09-29 15:00:47 +02:00
Brad King
e182ba735e
Merge topic 'defer-native-tool'
...
f8cb9944kwrobot@kitware.com >
Merge-request: !1317
2017-09-29 08:57:39 -04:00
Brad King
7b7c9f7c20
Merge topic 'simplify-generator-parameters'
...
29849376kwrobot@kitware.com >
Merge-request: !1318
2017-09-29 08:56:45 -04:00
Brad King
59285ee58e
Merge topic 'add-vs-shader-properties'
...
49dab3ebkwrobot@kitware.com >
Merge-request: !1319
2017-09-29 08:56:04 -04:00
Brad King
9fc0453140
Merge topic 'external-project-refactor-ep_get_complete_stampfile'
...
da470525kwrobot@kitware.com >
Merge-request: !1323
2017-09-29 08:55:17 -04:00
Brad King
41492c2d99
Merge topic 'FindMatlab-version-quoting'
...
a245f850kwrobot@kitware.com >
Merge-request: !1316
2017-09-29 08:54:22 -04:00
Brad King
194dd9ea8b
Merge topic 'autogen-macro-names2'
...
93c8d55d084ace4708041dd17b33d67b786b5be0kwrobot@kitware.com >
Merge-request: !1321
2017-09-29 08:53:13 -04:00
