summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'find-libarch-not-symlink'Brad King2017-03-014-16/+77
|\ | | | | | | | | | | 6f5aede7 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other e67963ed cmFindLibraryCommand: Refactor AddArchitecturePath logic
| * find_library: Skip 'lib => lib<arch>' searches if one symlinks the otherBrad King2017-02-284-0/+51
| | | | | | | | | | | | | | | | | | | | | | The `FIND_LIBRARY_USE_LIB<arch>_PATHS` global properties ask `find_library` to look in `lib<arch>` directories automatically before corresponding `lib` directories. However, if `lib<arch>` is just a symlink to `lib` (or vice-versa) then we should skip adding the `lib<arch>` path. Such symlinks typically only exist to satisfy software that expects the `lib<arch>` path to be available. Fixes: #16687
| * cmFindLibraryCommand: Refactor AddArchitecturePath logicBrad King2017-02-281-16/+26
| | | | | | | | | | Use boolean variables to save results and rename variables to more closely represent their roles.
* | Merge topic 'autogen_json_fix'Brad King2017-03-014-45/+46
|\ \ | | | | | | | | | | | | 48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
| * | Autogen: Fix for Q_PLUGIN_METADATA change detection testSebastian Holtermann2017-02-264-45/+46
| | |
* | | CMake Nightly Date StampKitware Robot2017-03-011-1/+1
| | |
* | | Merge branch 'release'Brad King2017-02-280-0/+0
|\ \ \
| * \ \ Merge branch 'kwiml-test-gcc-format-security' into releaseBrad King2017-02-271-1/+1
| |\ \ \
* | \ \ \ Merge topic 'kwiml-test-gcc-format-security'Brad King2017-02-280-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 4ca77bb6 KWIML: Add -Wno-format-security to tolerate -Werror=format-security
| * | | | KWIML: Add -Wno-format-security to tolerate -Werror=format-securityOrion Poplawski2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling KWIML tests with `-Werror=format-security` we get error: -Wformat-security ignored without -Wformat Therefore we should disable both `format` and `format-security` together.
* | | | | Merge topic '16607-error-out-on-non-seekable-input-files'Brad King2017-02-287-3/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ded616bd cmListFileLexer: bail out on seek-errors
| * | | | | cmListFileLexer: bail out on seek-errorsGregor Jasny2017-02-277-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we are given a FIFO, for example, we cannot seek back after trying to read a Byte-Order-Mark. Closes: #16607
* | | | | | Merge topic 'ExternalProject-fix-download-log'Brad King2017-02-282-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99d6de6c ExternalProject: only append `COMMAND` if actually adding a command
| * | | | | | ExternalProject: only append `COMMAND` if actually adding a commandBen Boeckel2017-02-272-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #16544.
* | | | | | | Merge topic 'cache-xaml-resx-headers'Brad King2017-02-282-7/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73a6d456 VS: Cache the list of xaml and resx headers
| * | | | | | | VS: Cache the list of xaml and resx headersDmitry Kochkin2017-02-272-7/+23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Speed up VS project generation with many such headers.
* | | | | | | 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"
generated by cgit v0.12 at 2025-01-24 08:02:37 (GMT)