Commit Graph

35346 Commits

Author SHA1 Message Date
Kitware Robot
3e4e6594da CMake Nightly Date Stamp 2017-03-29 00:01:07 -04:00
Brad King
cc4fbda1a9 Merge branch 'release' 2017-03-28 10:17:42 -04:00
Brad King
3d3eacbb61 Merge topic 'libarchive-backport-zip-dir-fix'
9dfccdc2 libarchive: backport zip directory recognition fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !634
2017-03-28 10:15:19 -04:00
Brad King
83199f8daf Merge topic 'InstallRequiredSystemLibraries-vs2017'
6eb609fd InstallRequiredSystemLibraries: Find VS 2017 redist directory
cf784d9f Add undocumented CMake language means to find VS 2017
082c0375 InstallRequiredSystemLibraries: Split VS 2017 search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !632
2017-03-28 10:14:59 -04:00
Brad King
4d97086848 Merge topic 'ninja-fix-sysconf-non-limit'
92fe00d3 Ninja: Fix command line limit when sysconf has no ARG_MAX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !633
2017-03-28 10:14:40 -04:00
Kitware Robot
21499431e0 CMake Nightly Date Stamp 2017-03-28 00:01:03 -04:00
Brad King
85abc5f5aa Merge branch 'libarchive-backport-zip-dir-fix' into release 2017-03-27 16:53:55 -04:00
Brad King
9dfccdc227 libarchive: backport zip directory recognition fix
Backport upstream libarchive commit 2ecf8d1c1e (Try harder to detect
directories in zip archives, 2016-12-23).

Fixes: #16741
2017-03-27 16:53:20 -04:00
Brad King
8c94f5085d Merge branch 'ninja-fix-sysconf-non-limit' into release 2017-03-27 13:42:30 -04:00
Christian Pfeiffer
92fe00d33c Ninja: Fix command line limit when sysconf has no ARG_MAX
The `sysconf(3)` manual explains that the return value can be `-1` for
limits if there is no definite limit.  Recognize this case and skip
using the value as a limit candidate.  Otherwise we use response files
unconditionally on such systems instead of checking other limits.

Fixes: #16740
2017-03-27 13:42:19 -04:00
Brad King
3ed87b7ee1 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-27 11:50:36 -04:00
Brad King
6eb609fd59 InstallRequiredSystemLibraries: Find VS 2017 redist directory
Use our undocumented `cmake_host_system_information` query to find the
VS 2017 installation directory by asking the VS installer tool.  Then
look relative to that for the redist directory.

Fixes: #16737
2017-03-27 11:43:01 -04:00
Brad King
cf784d9ff5 Add undocumented CMake language means to find VS 2017
Add a query to the `cmake_host_system_information` command to get
the location of a VS 2017 installation.  Leave it undocumented and
for internal use for now.
2017-03-27 11:43:01 -04:00
Brad King
082c0375d9 InstallRequiredSystemLibraries: Split VS 2017 search paths
VS 2017 does not have the same registry entries or other paths we
search for other VS versions.  Split the search code paths to treat
it separately.
2017-03-27 11:43:01 -04:00
Brad King
89e2c92f54 Merge topic 'cpack-rpm-debuginfo-honor-package-filename'
f237f5f8 CPack/RPM: support for debuginfo package renaming
6c09c5d6 CPack/RPM honor package file name on debuginfo enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !620
2017-03-27 09:13:31 -04:00
Brad King
42b7d132a8 Merge topic 'cpack-rpm-tests-handle-build-id-links'
4ba065b2 CPack/RPM tests: handle build-id links

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !628
2017-03-27 09:09:42 -04:00
Brad King
16cd860068 Merge branch 'cpack-rpm-tests-handle-build-id-links' into release 2017-03-27 09:08:39 -04:00
Domen Vrankar
4ba065b22b CPack/RPM tests: handle build-id links
Build id links generation was introduced
in rpm 4.13.0.1 so files related to them
should be ignored as they are not relevant
for the tests.

Fixes #16710
2017-03-27 09:08:24 -04:00
Brad King
341b42024b Merge topic 'cm-sys-stat'
e9fc7ff5 Add self-sufficient wrapper for <sys/stat.h>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !625
2017-03-27 09:05:13 -04:00
Brad King
ba3798555d Merge topic 'cpack-rpm-debuginfo-docs-cleanup'
1e0fc685 CPack/RPM can now generate a single debuginfo package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !630
2017-03-27 09:02:41 -04:00
Brad King
0ff8f127fb Merge topic 'update-kwsys'
ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys
fda80fde KWSys 2017-03-24 (7e9f7b7b)
64490637 update-kwsys: Disable custom gitattributes during import
f1a55839 update-third-party: Add helper to disable custom gitattributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !624
2017-03-27 09:02:02 -04:00
Brad King
bb27f72d67 Merge topic 'InstallRequiredSystemLibraries-test-openmp'
70d8f0d0 Tests: Activate InstallRequiredSystemLibraries OpenMP libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !623
2017-03-27 09:01:29 -04:00
Brad King
2b350775d2 Merge branch 'cpack-rpm-debuginfo-docs-cleanup' into release 2017-03-27 08:57:40 -04:00
Domen Vrankar
1e0fc68501 CPack/RPM can now generate a single debuginfo package
CMake 3.8 introduced possibility of
generating a single debuginfo package
even if component packaging is enabled
so this note no longer applies.
2017-03-27 08:57:33 -04:00
Kitware Robot
deec8919ba CMake Nightly Date Stamp 2017-03-27 00:01:02 -04:00
Kitware Robot
d6ef21cf70 CMake Nightly Date Stamp 2017-03-26 00:01:02 -04:00
Domen Vrankar
f237f5f851 CPack/RPM: support for debuginfo package renaming 2017-03-25 15:25:55 +01:00
Kitware Robot
3ac205f7dc CMake Nightly Date Stamp 2017-03-25 00:01:03 -04:00
Daniel Pfeifer
e9fc7ff505 Add self-sufficient wrapper for <sys/stat.h> 2017-03-24 22:58:25 +01:00
Brad King
ea2a91a432 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-03-24 (7e9f7b7b)

Resolve conflicts in `.gitattributes` by integrating changes from both
sides.  Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway).  Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
2017-03-24 15:17:25 -04:00
KWSys Upstream
fda80fde76 KWSys 2017-03-24 (7e9f7b7b)
Code extracted from:

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

at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master).

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

Brad King (3):
      0af48083 Drop custom Git whitespace check attribute
      6365886c Define a custom Git attribute to mark sources using our C style
      d22c2743 clang-format.bash: Use Git attributes to mark files for formatting

Egor Pugin (3):
      ce44c58a FStream: Export ReadBOM() from shared library
      04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template
      858d5edd Encoding: Export CommandLineArguments from shared library
2017-03-24 15:16:56 -04:00
Brad King
6449063784 update-kwsys: Disable custom gitattributes during import
The KWSys `.gitattributes` file now defines custom attributes.
Git does not support these in a subdirectory where we are about
to place the content, so comment them out during import.
This also ensures that the `our-c-style` attribute on KWSys
sources does not activate the `format.clang-format` attribute
on the third-party import branch.
2017-03-24 15:16:39 -04:00
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
Domen Vrankar
6c09c5d64c CPack/RPM honor package file name on debuginfo enabled
Packages with debuginfo enabled should
still honor defined package file name
if file name is not set to RPM-DEFAULT.

Fixes #16715
2017-03-24 19:52:02 +01: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
70d8f0d0f4 Tests: Activate InstallRequiredSystemLibraries OpenMP libs
The SimpleInstall test performs a smoke test of this module.
Activate the OpenMP code paths.
2017-03-24 10:40:58 -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