summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libarchive: Update script to get 3.3.1Brad King2017-02-271-1/+1
|
* CMake Nightly Date StampKitware Robot2017-02-271-1/+1
|
* CMake Nightly Date StampKitware Robot2017-02-261-1/+1
|
* CMake Nightly Date StampKitware Robot2017-02-251-1/+1
|
* Merge branch 'release'Brad King2017-02-240-0/+0
|\
| * Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
| |\
| * \ Merge branch 'clang-format-attrs' into releaseBrad King2017-02-229-44/+60
| |\ \
| * \ \ Merge branch 'doc-cmake-language-makefile-vars' into releaseBrad King2017-02-221-0/+6
| |\ \ \
| * \ \ \ Merge branch 'FindCUDA-fix-init' into releaseBrad King2017-02-221-0/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'GetPrerequisites-find_item_basename'Brad King2017-02-241-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eacf7dec GetPrerequisites: also try to resolve just the basename
| * | | | | | GetPrerequisites: also try to resolve just the basenameMichael Maltese2017-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #16625.
* | | | | | | Merge topic '16615-xcode-object-libraries-depends'Brad King2017-02-249-49/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Add test for object library dependenciesGregor Jasny2017-02-226-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16615
| * | | | | | | Xcode: Always track object library dependencies via hacky MakefileGregor Jasny2017-02-221-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Xcode: Record dependency information also for object librariesGregor Jasny2017-02-221-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Xcode: Collect dummy rules during iteration and emit afterwardsGregor Jasny2017-02-221-24/+13
| | | | | | | |
| * | | | | | | Makefile: Allow adding post-build rules to object librariesGregor Jasny2017-02-223-4/+15
| | | | | | | |
* | | | | | | | Merge topic 'dragndrop-format'Brad King2017-02-241-20/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 356068cd cmCPackDragNDropGenerator: Improving handling of temporary dmg images
| * | | | | | | | cmCPackDragNDropGenerator: Improving handling of temporary dmg imagesClinton Stimpson2017-02-231-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'vcxproj-indentation'Brad King2017-02-241-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 2cb165e8 VS: Fix .vcxproj indentation
| * | | | | | | | VS: Fix .vcxproj indentationBrad King2017-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'find_openmp_clang_patch'Brad King2017-02-241-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dc7a2ed FindOpenMP: Add iomp5 variant of Clang OpenMP flags
| * | | | | | | | | FindOpenMP: Add iomp5 variant of Clang OpenMP flagsLucas Czech2017-02-231-0/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge topic 'autogen_depends'Brad King2017-02-2422-101/+280
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Autogen: Add hint to SKIP_AUTOMOC in error messageSebastian Holtermann2017-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15751
| * | | | | | | | | Autogen: Add Quote function and use it for loggingSebastian Holtermann2017-02-231-51/+73
| | | | | | | | | |
| * | | | | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS documentationSebastian Holtermann2017-02-237-0/+75
| | | | | | | | | |
| * | | | | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS testSebastian Holtermann2017-02-2210-6/+46
| | | | | | | | | |
| * | | | | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS supportSebastian Holtermann2017-02-225-10/+55
| | | | | | | | | |
| * | | | | | | | | Autogen: Single point of return in Run() methodSebastian Holtermann2017-02-221-15/+19
| | | | | | | | | |
| * | | | | | | | | Autogen: Log simplificationsSebastian Holtermann2017-02-221-24/+15
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cmake-server-aix'Brad King2017-02-241-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c14db25 cmServerConnection.h: Include cmConfigure.h first
| * | | | | | | | | | cmServerConnection.h: Include cmConfigure.h firstBrad King2017-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to make Large File Support definitions consistent with other translation units.
* | | | | | | | | | | Merge topic 'update-libarchive'Brad King2017-02-2488-1981/+4720
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | libarchive: Avoid using isblankBrad King2017-02-231-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not available on VS 2012 and below. Use our own impl instead.
| * | | | | | | | | | | libarchive: Avoid declaration after statement in C codeBrad King2017-02-231-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | libarchive: Fix use of ssize_t in archive_entry.hBrad King2017-02-231-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | | | | | | | | libarchive: Define __LA_DEPRECATED consistentlyBrad King2017-02-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | Update CMake pre-cached values for libarchive 3.3.0Brad King2017-02-231-11/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-2086-1969/+4682
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
| | * | | | | | | | | | | LibArchive 2017-02-19 (100ee75a)LibArchive Upstream2017-02-2091-1999/+4855
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 100ee75a01f1f785fc681f616db49a33405f8bf3 (v3.3.0).
| * | | | | | | | | | | | libarchive: Update script to get 3.3.0Brad King2017-02-201-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'update-libuv'Brad King2017-02-2434-256/+1530
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 741b7621 Merge branch 'upstream-libuv' into update-libuv 1f661e87 libuv 2017-02-21 (52ae8264)
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-libuv' into update-libuvBrad King2017-02-2234-256/+1530
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2017-02-21 (52ae8264)
| | * | | | | | | | | | | | libuv 2017-02-21 (52ae8264)libuv upstream2017-02-2234-263/+1536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 52ae826492f50f151138ed115faa5e0ac8c803ce (v1.x).
* | | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-02-241-1/+1
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'doc-cmake-language-makefile-vars'Brad King2017-02-231-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dc13019 Help: Clarify 'make-style' variable references in cmake-language(7)
| * | | | | | | | | | | | Help: Clarify 'make-style' variable references in cmake-language(7)Michael Maltese2017-02-221-0/+6
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16661
* | | | | | | | | | | | Merge topic 'clang-format-attrs'Brad King2017-02-239-44/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-229-32/+27
| | | | | | | | | | | |