Commit Graph

35312 Commits

Author SHA1 Message Date
Brad King
f1a5583901 update-third-party: Add helper to disable custom gitattributes
Provide a helper function that import scripts can use when the
third-party project defines custom Git attributes in its top-level
`.gitattributes` file.  These must be commented out because Git
does not support custom attributes in a subdirectory where we
where the third-party project is about to be merged.
2017-03-24 15:13:55 -04:00
Brad King
3142808f15 Merge branch 'release' 2017-03-24 10:45:05 -04:00
Brad King
97662babe9 Merge topic 'binaries-from-gitlab-repo'
954185d4 Utilities/Release: Fetch stage/master/head

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !621
2017-03-24 10:43:43 -04:00
Brad King
954185d414 Utilities/Release: Fetch stage/master/head
Update our release scripts to fetch `refs/stage/master/head` from
the `gitlab.kitware.com` repository.  This will allow us to prepare
releases from staged commits before merging them to `master` or
`release`.
2017-03-24 08:56:41 -04:00
Brad King
3b7f19a72f CMake 3.8.0-rc3 v3.8.0-rc3 2017-03-24 08:47:13 -04:00
Brad King
09a80c4be6 Merge branch 'release' 2017-03-24 08:35:10 -04:00
Brad King
8047bd6c0d Merge topic 'iwyu'
41ec3528 IWYU: use pragma export
72ea66b1 Autogen: include what you use
2a827b82 cmCPackGenerator: Move macros to bottom of file
bcd08aa3 cmCTest: Move macros to bottom of file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !619
2017-03-24 08:33:47 -04:00
Brad King
5bded841b4 Merge topic '16680-ios-bundle-resources'
b5189fda Apple: Add test for bundle resource layout
c51c2cfa Apple: Fix Resources location for all generators
060be58c Xcode: Properly handle Bundle Resources with more than one hierarchy level
484ccb0c Xcode: Properly handle non-resource Bundle files on iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !613
2017-03-24 08:32:41 -04:00
Brad King
0f4420e0a8 Merge topic 'autogen_rcc_test'
35e8a6de Autogen: Tests: More rigorous rcc rebuild tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !618
2017-03-24 08:32:24 -04:00
Brad King
8b25d8e23c Merge topic 'cpack-rpm-correct-error-message-debug-lengths'
8dc23a43 CPack/RPM: fix error message associated with source path length

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Domen Vrankar <domen.vrankar@gmail.com>
Merge-request: !614
2017-03-24 08:23:15 -04:00
Brad King
1898f7c7d3 Merge topic 'InstallRequiredSystemLibraries-vs2017'
d4a693a0 InstallRequiredSystemLibraries: Add support for VS 2017
5ed4e481 InstallRequiredSystemLibraries: Split MFC redist dir variable
dbdb880a InstallRequiredSystemLibraries: Split VS IDE and DLL versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !616
2017-03-24 08:21:57 -04:00
Brad King
0fe705a2c3 Merge topic 'make_sure_cuda_tests_run'
d40fc885 CUDA: ObjectLibrary test executable now runs on OSX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !615
2017-03-24 08:20:08 -04:00
Brad King
080350b622 Merge topic 'suppress-xcode-error'
ede8db10 RunCMake: Ignore xcodebuild bug warnings in tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !617
2017-03-24 08:18:32 -04:00
Gregor Jasny
ede8db109c RunCMake: Ignore xcodebuild bug warnings in tests
Encountered on OS X 10.4 with old Xcode:

  Expected stderr to match:

   expect-err> ^$

  Actual stderr:

   actual-err> Hit xcodebuild bug : ... bad interpreter: Text file busy
2017-03-24 08:15:16 -04:00
Kitware Robot
6cd8aa3c2a CMake Nightly Date Stamp 2017-03-24 00:01:07 -04:00
Daniel Pfeifer
41ec352832 IWYU: use pragma export 2017-03-23 23:38:46 +01:00
Daniel Pfeifer
72ea66b1cf Autogen: include what you use 2017-03-23 23:20:10 +01:00
Daniel Pfeifer
2a827b8244 cmCPackGenerator: Move macros to bottom of file
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
2017-03-23 23:08:57 +01:00
Daniel Pfeifer
bcd08aa383 cmCTest: Move macros to bottom of file
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
2017-03-23 23:08:56 +01:00
Brad King
1adbe223cd Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into release 2017-03-23 13:48:17 -04:00
Daniel Black
8dc23a4380 CPack/RPM: fix error message associated with source path length 2017-03-23 13:47:58 -04:00
Sebastian Holtermann
35e8a6de86 Autogen: Tests: More rigorous rcc rebuild tests
Closes: #16103
2017-03-23 16:51:34 +01:00
Gregor Jasny
b5189fda24 Apple: Add test for bundle resource layout
Closes: #16680
2017-03-23 16:43:55 +01:00
Gregor Jasny
c51c2cfac6 Apple: Fix Resources location for all generators
Issue: #16680
2017-03-23 16:43:55 +01:00
Brad King
40cf5e0e07 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-23 10:43:00 -04:00
Brad King
d4a693a083 InstallRequiredSystemLibraries: Add support for VS 2017
VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*`
directories but still uses version number `140` in the DLL names.  The
redist directories now have version numbers in their name, and the MSVC
and MFC runtime DLLs may be in directories with different versions.
Fill out our logic to handle this.

For now assume we are given the `MSVC_REDIST_DIR` value as a cache
entry.  Unfortunately we cannot yet find the VS 2017 MSVC redist
directory automatically since there is no registry entry for the VS
installation.  Later we will have to use `cmVSSetupHelper` for this.

Issue: #16735
2017-03-23 10:30:14 -04:00
Brad King
5ed4e48128 InstallRequiredSystemLibraries: Split MFC redist dir variable 2017-03-23 10:26:52 -04:00
Brad King
dbdb880af9 InstallRequiredSystemLibraries: Split VS IDE and DLL versions
Refactor MSVC logic to split the IDE and DLL version variables.
2017-03-23 10:14:50 -04:00
Robert Maynard
d40fc8856d CUDA: ObjectLibrary test executable now runs on OSX 2017-03-23 09:44:30 -04:00
Brad King
f0f60c548a Merge branch 'release' 2017-03-23 08:50:41 -04:00
Brad King
677b3cbf28 Merge topic 'server-mode-fix-home-dir-check'
8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
2017-03-23 08:46:30 -04:00
Brad King
f673623130 Merge topic 'InstallRequiredSystemLibraries-refactor'
a2aad448 InstallRequiredSystemLibraries: Drop version from variable names
16eb58d5 InstallRequiredSystemLibraries: Refactor to avoid macros
a259e8db InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !612
2017-03-23 08:46:04 -04:00
Brad King
cfa55fd428 Merge topic 'doc-prefer-MSVC_VERSION'
fecf8467 Help: Document preference of `MSVC_VERSION` over `MSVC##`
712452e3 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
49a60b70 MSVC: Exclude future cl 20+ from MSVC14 variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !609
2017-03-23 08:44:58 -04:00
Brad King
a1440504ff Merge topic 'avoid-MSVC-per-version-vars'
9ab966a7 FindRuby: Use `MSVC_VERSION` instead of `MSVC##`
69b9fde1 FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`
3fe31822 FindBoost: Avoid mentioning discouraged `MSVC##`` variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !610
2017-03-23 08:44:22 -04:00
Brad King
e978a2e5b1 Merge topic 'FindwxWidgets-vs-2017'
8f207df1 FindwxWidgets: Add support for VS 2017 v141 toolset
73f7d266 FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !608
2017-03-23 08:44:05 -04:00
Brad King
324d7f5a50 Merge branch 'server-mode-fix-home-dir-check' into release 2017-03-23 08:42:51 -04:00
Brad King
51ef9bb1eb Merge branch 'InstallRequiredSystemLibraries-refactor' into release 2017-03-23 08:42:42 -04:00
Brad King
b8c72c50f7 Merge branch 'avoid-MSVC-per-version-vars' into release 2017-03-23 08:42:37 -04:00
Brad King
9ab966a722 FindRuby: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King
69b9fde148 FindGTK2: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King
3fe3182247 FindBoost: Avoid mentioning discouraged MSVC##` variable 2017-03-23 08:40:34 -04:00
Brad King
922b7770bd Merge topic 'cpack_nsis_sign_uninstaller'
e1ee7b43 CPack/NSIS: Avoid a race condition when generating the installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !605
2017-03-23 08:29:49 -04:00
Kitware Robot
82db83d2f1 CMake Nightly Date Stamp 2017-03-23 00:01:06 -04:00
Gregor Jasny
060be58c6f Xcode: Properly handle Bundle Resources with more than one hierarchy level
Issue: #16680
2017-03-22 23:36:11 +01:00
Gregor Jasny
484ccb0c45 Xcode: Properly handle non-resource Bundle files on iOS
Issue: #16680
2017-03-22 21:16:42 +01:00
Brad King
a2aad448e1 InstallRequiredSystemLibraries: Drop version from variable names
Each `MSVC${v}_*_DIR` variable is only ever used with one value for
`${v}` within a given build tree.  Drop the `${v}` version component
from the variable names.
2017-03-22 15:58:40 -04:00
Brad King
16eb58d503 InstallRequiredSystemLibraries: Refactor to avoid macros
For a given `MSVC_VERSION` our macros were each called at most once.
Replace them with a single code path that is parameterized over what
was the macro argument.
2017-03-22 15:48:34 -04:00
Brad King
a259e8db8f InstallRequiredSystemLibraries: Use MSVC_VERSION instead of MSVC##
Issue: #16735
2017-03-22 12:50:10 -04:00
Tobias Hunger
8285ad511a server-mode: Make CMAKE_HOME_DIRECTORY more reliable
Make CMAKE_HOME_DIRECTORY detection work more reliably in the face
of symlinks.

Closes #16736
2017-03-22 17:31:02 +01:00
Brad King
d2fb1264d7 Merge branch 'doc-prefer-MSVC_VERSION' into release 2017-03-22 11:28:31 -04:00