summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'cmake-xcode-schemes'Brad King2017-02-288-0/+302
|\
| * Xcode: Add documentation for schema generatorGregor Jasny2017-02-283-0/+18
| * Xcode: Write shared schemes based on the default files generated by XcodeGusts Kaksis2017-02-285-0/+284
* | Merge topic 'update-kwiml'Brad King2017-02-281-1/+1
|\ \
| * \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2017-02-271-1/+1
| |\ \
| | * | KWIML 2017-02-27 (aa3a7733)KWIML Upstream2017-02-271-1/+1
* | | | Merge topic 'update-libarchive'Brad King2017-02-2815-125/+227
|\ \ \ \
| * | | | libarchive: Remove liblzma from introspection testsBrad King2017-02-271-2/+0
| * | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-2714-124/+228
| |\ \ \ \
| | * | | | LibArchive 2017-02-25 (d6b1bb9f)LibArchive Upstream2017-02-2715-125/+256
| * | | | | libarchive: Update script to get 3.3.1Brad King2017-02-271-1/+1
* | | | | | Merge topic 'libuv-solaris-10'Brad King2017-02-284-7/+19
|\ \ \ \ \ \
| * | | | | | Enable libuv on Solaris 10Brad King2017-02-281-6/+0
| * | | | | | libuv: Compile as C 90 on Solaris 10Brad King2017-02-281-0/+3
| * | | | | | libuv: Link to 'rt' library on Solaris 10 to get semaphoresBrad King2017-02-261-0/+1
| * | | | | | libuv: Implement mkdtemp on Solaris 10Brad King2017-02-261-1/+11
| * | | | | | libuv: automatically skip ifaddrs on Solaris 10Brad King2017-02-261-0/+4
* | | | | | | Merge topic 'cmake-host-system-name'Brad King2017-02-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix CMAKE_HOST_SYSTEM_NAME on SunOSBrad King2017-02-271-1/+1
* | | | | | | | CMake Nightly Date StampKitware Robot2017-02-281-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2017-02-270-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ExternalProject-checkout-clarify' into releaseBrad King2017-02-241-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'object-library-compile-pdb' into releaseBrad King2017-02-242-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ninja-no-full-path' into releaseBrad King2017-02-241-4/+3
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.7'Brad King2017-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ninja-no-full-path' into release-3.7Brad King2017-02-241-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge topic 'ExternalProject-checkout-clarify'Brad King2017-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
* | | | | | | | | | | | Merge topic 'object-library-compile-pdb'Brad King2017-02-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-242-1/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'test-objlib-deps-cleanup'Brad King2017-02-2710-36/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tests: Change RunCMake.ObjectLibrary dependencies case to CBrad King2017-02-2610-31/+27
| * | | | | | | | | | | Tests: Fix RunCMake.ObjectLibrary dependency delayBrad King2017-02-261-5/+11
* | | | | | | | | | | | Merge topic 'ninja-no-full-path'Brad King2017-02-271-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Revert "Ninja: Use full path for all source files"Brad King2017-02-241-4/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | GetPrerequisites: also try to resolve just the basenameMichael Maltese2017-02-221-0/+5
* | | | | | | | | | | | | | Merge topic '16615-xcode-object-libraries-depends'Brad King2017-02-249-49/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Add test for object library dependenciesGregor Jasny2017-02-226-0/+52
| * | | | | | | | | | | | | Xcode: Always track object library dependencies via hacky MakefileGregor Jasny2017-02-221-14/+12
| * | | | | | | | | | | | | Xcode: Record dependency information also for object librariesGregor Jasny2017-02-221-8/+30
| * | | | | | | | | | | | | Xcode: Collect dummy rules during iteration and emit afterwardsGregor Jasny2017-02-221-24/+13