summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-xcode-schemes'Brad King2017-02-288-0/+302
|\ | | | | | | | | | | 7238a052 Xcode: Add documentation for schema generator ffb8817b Xcode: Write shared schemes based on the default files generated by Xcode
| * 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
| | | | | | | | Issue: #15441
* | Merge topic 'update-kwiml'Brad King2017-02-281-1/+1
|\ \ | | | | | | | | | | | | | | | f77420cf Merge branch 'upstream-KWIML' into update-kwiml ae6607af KWIML 2017-02-27 (aa3a7733)
| * \ Merge branch 'upstream-KWIML' into update-kwimlBrad King2017-02-271-1/+1
| |\ \ | | | | | | | | | | | | | | | | * upstream-KWIML: KWIML 2017-02-27 (aa3a7733)
| | * | KWIML 2017-02-27 (aa3a7733)KWIML Upstream2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwiml.git at commit aa3a7733039afb11047fb7d4d71fb26e1775c106 (master). Upstream Shortlog ----------------- Orion Poplawski (1): aa3a7733 test: Add -Wno-format-security to tolerate -Werror=format-security
* | | | Merge topic 'update-libarchive'Brad King2017-02-2815-125/+227
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | libarchive: Remove liblzma from introspection testsBrad King2017-02-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-2714-124/+228
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2017-02-25 (d6b1bb9f)
| | * | | | LibArchive 2017-02-25 (d6b1bb9f)LibArchive Upstream2017-02-2715-125/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit d6b1bb9f7ea7bc153b7356e8e345c9e48005821a (v3.3.1).
| * | | | | libarchive: Update script to get 3.3.1Brad King2017-02-271-1/+1
| | | | | |
* | | | | | Merge topic 'libuv-solaris-10'Brad King2017-02-284-7/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Enable libuv on Solaris 10Brad King2017-02-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We've ported our libuv to this platform so we can build it now.
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS
| * | | | | | | Fix CMAKE_HOST_SYSTEM_NAME on SunOSBrad King2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
| * | | | | | | | | | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Fixes: #16678
* | | | | | | | | | | | Merge topic 'object-library-compile-pdb'Brad King2017-02-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
| * | | | | | | | | | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-242-1/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge topic 'test-objlib-deps-cleanup'Brad King2017-02-2710-36/+38
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C 01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
| * | | | | | | | | | | Tests: Change RunCMake.ObjectLibrary dependencies case to CBrad King2017-02-2610-31/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Tests: Fix RunCMake.ObjectLibrary dependency delayBrad King2017-02-261-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sleep before the second copy to avoid the need for a touch. Sleep for longer on generators whose build tools have low resolution timestamps.
* | | | | | | | | | | | Merge topic 'ninja-no-full-path'Brad King2017-02-271-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | 666ad1df Revert "Ninja: Use full path for all source files"
| * | | | | | | | | | Revert "Ninja: Use full path for all source files"Brad King2017-02-241-4/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | 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
| | | | | | | | | | | | | |
generated by cgit v0.12 at 2024-12-24 18:39:42 (GMT)