35113 Commits

Author SHA1 Message Date
Brad King
52a3022df6 Merge branch 'ninja-no-full-path' into release-3.7 2017-02-24 10:16:24 -05:00
Brad King
666ad1df2d Revert "Ninja: Use full path for all source files"
This reverts commit v3.7.0-rc1~275^2 (Ninja: Use full path for all
source files, 2016-08-05).  Unfortunately using absolute paths can
cause incorrect rebuilds due to ninja limitations.  The ninja
manual [1] explains:

> ... using absolute paths, your depfile may result in a mixture of
> relative and absolute paths. Paths used by other build rules need
> to match exactly.

Passing an absolute path to a source file to the compiler while using a
relative path in the ninja build manifest can cause such mixture and
lead to incorrect rebuilds.  Simply revert the change for now.

Note that there was a follow-up to the original change in commit
v3.7.0-rc2~10^2 (Ninja: Fix RC language depfile generation with
cmcldeps, 2016-10-13).  We don't need to revert that because that
change made the relevant code cleverly adapt to whatever variable
we use to reference the source file.

[1] https://ninja-build.org/manual.html#_deps

Fixes: #16675
Issue: #13894
2017-02-24 10:15:50 -05:00
Brad King
badc2c44d8 Merge branch 'release' 2017-02-24 10:01:54 -05:00
Brad King
fd14f87339 Merge topic 'GetPrerequisites-find_item_basename'
eacf7dec GetPrerequisites: also try to resolve just the basename
2017-02-24 09:31:41 -05:00
Brad King
32f13fbe09 Merge topic '16615-xcode-object-libraries-depends'
624021a0 Add test for object library dependencies
5da9266a Xcode: Always track object library dependencies via hacky Makefile
e80ac953 Xcode: Record dependency information also for object libraries
9293e57d Xcode: Collect dummy rules during iteration and emit afterwards
33a1d727 Makefile: Allow adding post-build rules to object libraries
2017-02-24 09:31:39 -05:00
Brad King
58ec4932e3 Merge topic 'dragndrop-format'
356068cd cmCPackDragNDropGenerator: Improving handling of temporary dmg images
2017-02-24 09:31:36 -05:00
Brad King
17c151965d Merge topic 'vcxproj-indentation'
2cb165e8 VS: Fix .vcxproj indentation
2017-02-24 09:31:33 -05:00
Brad King
0b0e28d30b Merge topic 'find_openmp_clang_patch'
9dc7a2ed FindOpenMP: Add iomp5 variant of Clang OpenMP flags
2017-02-24 09:31:30 -05:00
Brad King
31282e7854 Merge topic 'autogen_depends'
62a1e292 Autogen: Add hint to SKIP_AUTOMOC in error message
e98465cf Autogen: Add Quote function and use it for logging
96f6f392 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation
94e3f82c Autogen: Add AUTOMOC_DEPEND_FILTERS test
70ebf35c Autogen: Add AUTOMOC_DEPEND_FILTERS support
2a6fd432 Autogen: Single point of return in Run() method
e9a8a207 Autogen: Log simplifications
2017-02-24 09:31:27 -05:00
Brad King
f104fe45fc Merge topic 'cmake-server-aix'
0c14db25 cmServerConnection.h: Include cmConfigure.h first
2017-02-24 09:31:25 -05:00
Brad King
33f636264a Merge topic 'update-libarchive'
d49176e9 libarchive: Avoid using isblank
ce8f117f libarchive: Avoid declaration after statement in C code
e0f725f8 libarchive: Fix use of ssize_t in archive_entry.h
ae4861ec libarchive: Define __LA_DEPRECATED consistently
fecb70dd Update CMake pre-cached values for libarchive 3.3.0
a59a7ee9 Merge branch 'upstream-LibArchive' into update-libarchive
c206211a LibArchive 2017-02-19 (100ee75a)
cdce7c61 libarchive: Update script to get 3.3.0
2017-02-24 09:31:22 -05:00
Brad King
8429068d7c Merge topic 'update-libuv'
741b7621 Merge branch 'upstream-libuv' into update-libuv
1f661e87 libuv 2017-02-21 (52ae8264)
2017-02-24 09:31:18 -05:00
Kitware Robot
32cb4172bd CMake Nightly Date Stamp 2017-02-24 00:01:05 -05:00
Clinton Stimpson
356068cd2e cmCPackDragNDropGenerator: Improving handling of temporary dmg images
Adjust the image format to create the initial `dmg`, and convert only
when necessary.  This eliminates spurious

    hdiutil create -format UDRW

failures I'm seeing which may be related to an anti-virus scanner.
Running

    hdiutil create -format UDRW -verbose

indicates a "resource is busy" issue when unmounting an image.
2017-02-23 14:12:52 -05:00
Brad King
5eb4d9d80b Merge branch 'vcxproj-indentation' into release 2017-02-23 14:01:05 -05:00
Brad King
2cb165e8c0 VS: Fix .vcxproj indentation
In commit v3.8.0-rc1~87^2~1 (VS: added support for C#, 2017-01-09) we
removed what looked like a no-op streaming operation but in fact it
is responsible for applying indentation.  Restore the line.
2017-02-23 13:38:47 -05:00
Lucas Czech
9dc7a2ed2c FindOpenMP: Add iomp5 variant of Clang OpenMP flags
Try `-fopenmp=libiomp5` in addition to `-fopenmp=libomp`.  Leave the
latter as the default that we try first when the compiler id is `Clang`.
If that does not work we will still fall back to trying all the
candidates and eventually get to the iomp5 variant.
2017-02-23 09:59:46 -05:00
Sebastian Holtermann
62a1e292f2 Autogen: Add hint to SKIP_AUTOMOC in error message
Closes #15751
2017-02-23 14:14:29 +01:00
Sebastian Holtermann
e98465cfed Autogen: Add Quote function and use it for logging 2017-02-23 14:14:29 +01:00
Sebastian Holtermann
96f6f392e3 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation 2017-02-23 14:14:29 +01:00
Brad King
3f8e94f71e Merge topic 'doc-cmake-language-makefile-vars'
1dc13019 Help: Clarify 'make-style' variable references in cmake-language(7)
2017-02-23 07:35:36 -05:00
Brad King
d23f4414c4 Merge topic 'clang-format-attrs'
d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting
f6986ee4 Define a custom Git attribute to mark sources using our C style
2256c3a7 Define a custom Git attribute to mark source files as generated
2017-02-23 07:35:32 -05:00
Brad King
e68aad3eb8 Merge topic 'FindCUDA-fix-init'
934eb497 FindCUDA: Fix PTX selection with multiple architectures
2017-02-23 07:35:29 -05:00
Brad King
e2717d69df Merge topic 'cmake_m4_find_package_var_check'
7788db9c cmake.m4: do not set _XXXFLAGS or _LIBS var if already set
2017-02-23 07:35:26 -05:00
Brad King
0c14db2558 cmServerConnection.h: Include cmConfigure.h first
We need this to make Large File Support definitions consistent with
other translation units.
2017-02-23 07:32:24 -05:00
John Donoghue
7788db9c4e cmake.m4: do not set _XXXFLAGS or _LIBS var if already set
* Auxiliary/cmake.m4 (CMAKE_FIND_PACKAGE): change var tests from -n to -z
  to check if var is already set before calling cmake

Fixes: #14460, #16663
2017-02-23 07:16:16 -05:00
Brad King
d49176e91e libarchive: Avoid using isblank
It is not available on VS 2012 and below.  Use our own impl instead.
2017-02-23 07:15:21 -05:00
Brad King
ce8f117fe2 libarchive: Avoid declaration after statement in C code 2017-02-23 07:15:21 -05:00
Brad King
e0f725f821 libarchive: Fix use of ssize_t in archive_entry.h
This type is not available on Windows compilers so for clients including
this header we need to use `la_ssize_t` instead as we do in `archive.h`.
2017-02-23 07:15:21 -05:00
Brad King
ae4861ec22 libarchive: Define __LA_DEPRECATED consistently
Upstream libarchive now defines this macro in two places with the same
logic in both.  However, CMake's bundled copy disables this macro, so
we need to update the new location of its definition to be consistent.
2017-02-23 07:15:20 -05:00
Brad King
fecb70dd34 Update CMake pre-cached values for libarchive 3.3.0 2017-02-23 07:15:19 -05:00
Kitware Robot
77cbcb76bb CMake Nightly Date Stamp 2017-02-23 00:01:03 -05:00
Brad King
25480ffbf6 Merge branch 'clang-format-attrs' into release 2017-02-22 17:00:58 -05:00
Brad King
d5f39a56a4 clang-format.bash: Use Git attributes to mark files for formatting 2017-02-22 16:59:26 -05:00
Brad King
f6986ee479 Define a custom Git attribute to mark sources using our C style 2017-02-22 16:53:29 -05:00
Brad King
2256c3a7db Define a custom Git attribute to mark source files as generated 2017-02-22 16:53:26 -05:00
Brad King
970fe6ec2f Merge branch 'doc-cmake-language-makefile-vars' into release 2017-02-22 16:50:18 -05:00
Michael Maltese
1dc1301925 Help: Clarify 'make-style' variable references in cmake-language(7)
Fixes: #16661
2017-02-22 13:39:09 -08:00
Michael Maltese
eacf7decbf GetPrerequisites: also try to resolve just the basename
Fixes #16625.
2017-02-22 12:27:39 -08:00
Gregor Jasny
624021a09e Add test for object library dependencies
Issue: #16615
2017-02-22 15:21:06 -05:00
Gregor Jasny
5da9266af5 Xcode: Always track object library dependencies via hacky Makefile
Always use the dependency tracker Makefile to ensure targets that
depend on object libraries are up-to-date.  For all other target
types we use the hack only for Xcode < 5.

Fixes: #16615
2017-02-22 15:20:11 -05:00
Sebastian Holtermann
94e3f82cf1 Autogen: Add AUTOMOC_DEPEND_FILTERS test 2017-02-22 21:15:03 +01:00
Sebastian Holtermann
70ebf35cda Autogen: Add AUTOMOC_DEPEND_FILTERS support 2017-02-22 21:13:48 +01:00
Sebastian Holtermann
2a6fd4328a Autogen: Single point of return in Run() method 2017-02-22 17:52:16 +01:00
Sebastian Holtermann
e9a8a207ad Autogen: Log simplifications 2017-02-22 17:44:35 +01:00
Gregor Jasny
e80ac95303 Xcode: Record dependency information also for object libraries
Xcode seems to have troubles to track target dependecies to
object files. This may lead to stale targets as reported in
issue #16615.

As a work-around the pre-Xcode 5 dependecy tracker hack with
post-build make files is extended to also take object libraries
into account.
2017-02-22 17:05:18 +01:00
Gregor Jasny
9293e57d9c Xcode: Collect dummy rules during iteration and emit afterwards 2017-02-22 17:05:17 +01:00
Gregor Jasny
33a1d727d5 Makefile: Allow adding post-build rules to object libraries 2017-02-22 17:05:17 +01:00
Brad King
4734c3e6db Merge branch 'FindCUDA-fix-init' into release 2017-02-22 10:35:55 -05:00
Bjoern Thiel
934eb497f2 FindCUDA: Fix PTX selection with multiple architectures 2017-02-22 10:35:44 -05:00