Commit Graph

34943 Commits

Author SHA1 Message Date
Brad King
6a8da1d777 Merge topic 'update-libarchive'
29528cc3 libarchive: Remove liblzma from introspection tests
62d0e223 Merge branch 'upstream-LibArchive' into update-libarchive
059aa805 LibArchive 2017-02-25 (d6b1bb9f)
5fee7660 libarchive: Update script to get 3.3.1
2017-02-28 09:11:45 -05:00
Brad King
09a81e29fe Merge topic 'libuv-solaris-10'
a3335709 Enable libuv on Solaris 10
e4ac7c2b libuv: Compile as C 90 on Solaris 10
c9b3c562 libuv: Link to 'rt' library on Solaris 10 to get semaphores
f0698692 libuv: Implement mkdtemp on Solaris 10
5651257f libuv: automatically skip ifaddrs on Solaris 10
2017-02-28 09:11:42 -05:00
Brad King
fd6b260c40 Merge topic 'cmake-host-system-name'
c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS
2017-02-28 09:11:40 -05:00
Brad King
a333570914 Enable libuv on Solaris 10
We've ported our libuv to this platform so we can build it now.
2017-02-28 09:03:12 -05:00
Brad King
e4ac7c2b4f libuv: Compile as C 90 on Solaris 10 2017-02-28 09:03:12 -05:00
Kitware Robot
8bfa6a00ea CMake Nightly Date Stamp 2017-02-28 00:01:08 -05:00
Brad King
c1aaf8a61d Fix CMAKE_HOST_SYSTEM_NAME on SunOS
In commit 0bbd993f (Make CMAKE_HOST_SYSTEM_NAME available in scripting
context, 2016-12-26) we added a call to `uname` that checks for a zero
return value.  However, on Solaris the `uname(2)` manual [1] says that
on success a non-negative value is returned.  Fix our return code check
so that we detect the `SunOS` name correctly.

[1] https://docs.oracle.com/cd/E53394_01/html/E54765/uname-2.html
2017-02-27 10:30:45 -05:00
Brad King
cdb6d7df97 Merge branch 'release' 2017-02-27 09:12:42 -05:00
Brad King
aa45291e7f Merge branch 'release-3.7' 2017-02-27 09:12:29 -05:00
Brad King
f79efeac79 Merge topic 'ExternalProject-checkout-clarify'
a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
2017-02-27 09:11:25 -05:00
Brad King
e348d8db55 Merge topic 'object-library-compile-pdb'
feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
2017-02-27 09:11:22 -05:00
Brad King
9b02283a1f Merge topic 'test-objlib-deps-cleanup'
b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C
01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
2017-02-27 09:11:20 -05:00
Brad King
73909e2421 Merge topic 'ninja-no-full-path'
666ad1df Revert "Ninja: Use full path for all source files"
2017-02-27 09:11:17 -05:00
Brad King
29528cc33e libarchive: Remove liblzma from introspection tests
This was added upstream but does not make sense in CMake because we
may replace the library with a logical target name that will not
work inside a `try_compile`.
2017-02-27 08:53:08 -05:00
Brad King
62d0e22325 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2017-02-25 (d6b1bb9f)
2017-02-27 08:51:36 -05:00
LibArchive Upstream
059aa805c9 LibArchive 2017-02-25 (d6b1bb9f)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit d6b1bb9f7ea7bc153b7356e8e345c9e48005821a (v3.3.1).
2017-02-27 08:47:35 -05:00
Brad King
5fee76606b libarchive: Update script to get 3.3.1 2017-02-27 08:47:11 -05:00
Kitware Robot
adcade6088 CMake Nightly Date Stamp 2017-02-27 00:01:03 -05:00
Brad King
c9b3c5625a libuv: Link to 'rt' library on Solaris 10 to get semaphores 2017-02-26 10:48:26 -05:00
Brad King
f06986926a libuv: Implement mkdtemp on Solaris 10 2017-02-26 10:48:26 -05:00
Brad King
5651257fff libuv: automatically skip ifaddrs on Solaris 10 2017-02-26 10:48:26 -05:00
Brad King
b35a949bb6 Tests: Change RunCMake.ObjectLibrary dependencies case to C 2017-02-26 10:43:32 -05:00
Brad King
0134795418 Tests: Fix RunCMake.ObjectLibrary dependency delay
Sleep before the second copy to avoid the need for a touch.
Sleep for longer on generators whose build tools have low
resolution timestamps.
2017-02-26 10:43:30 -05:00
Kitware Robot
da915157b0 CMake Nightly Date Stamp 2017-02-26 00:01:02 -05:00
Kitware Robot
160ebe58b5 CMake Nightly Date Stamp 2017-02-25 00:01:03 -05:00
Brad King
dab2ff3e23 Merge branch 'ExternalProject-checkout-clarify' into release 2017-02-24 13:22:45 -05:00
Brad King
a9fa6a2c77 ExternalProject: Run git checkout with -- to clarify arguments
Fix the case when the tag name to be checked out also happens to match a
path name.

Fixes: #16678
2017-02-24 13:22:40 -05:00
Brad King
ad3bf56dd2 Merge branch 'object-library-compile-pdb' into release 2017-02-24 11:31:46 -05:00
Brad King
feff52d42c Fix COMPILE_PDB_NAME when used on an OBJECT library
When `COMPILE_PDB_NAME` is used without `COMPILE_PDB_OUTPUT_DIRECTORY`
we cannot fall back on the link `PDB_OUTPUT_DIRECTORY` for an object
library because it has no link step.

Fixes: #16674
2017-02-24 11:26:52 -05:00
Brad King
8ea060f960 Merge branch 'ninja-no-full-path' into release 2017-02-24 10:50:21 -05:00
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