summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.9'Brad King2017-06-120-0/+0
|\
| * Merge branch 'android-standalone-no-sysroot-include' into release-3.9Brad King2017-06-091-2/+7
| |\
| * \ Merge branch 'android-standalone-unified-api-level' into release-3.9Brad King2017-06-091-5/+28
| |\ \
* | \ \ Merge topic 'android-standalone-no-sysroot-include'Brad King2017-06-121-2/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 22f8a465 Android: Do not pass sysroot include for standalone toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !952
| * | | Android: Do not pass sysroot include for standalone toolchainBrad King2017-06-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) does not make sense when compiling with a standalone toolchain which is tied to a single API version. Drop the explicit include directory so that the compiler uses its default system include order. Fixes: #16954
* | | | Merge topic 'android-standalone-unified-api-level'Brad King2017-06-121-5/+28
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 5f93bf78 Android: Detect API version of standalone toolchain with unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !950
| * | | Android: Detect API version of standalone toolchain with unified headersBrad King2017-06-091-5/+28
| |/ / | | | | | | | | | | | | | | | | | | A standalone toolchain with unified headers keeps the `__ANDROID_API__` macro in the `bin/clang` launcher instead of in `api-level.h`. Issue: #16954
* | | Merge topic 'execute_process-pipeline-results'Brad King2017-06-128-3/+237
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d6051ca3 execute_process: Add option to get results of every child Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !702
| * | | execute_process: Add option to get results of every childAdam Weisi2017-06-108-3/+237
| | | | | | | | | | | | | | | | | | | | Add a `RESULTS_VARIABLE` option to get the results of all children in a pipeline of one or more `COMMAND`s.
* | | | Merge topic 'cpack-freebsd-pkg'Brad King2017-06-1210-0/+696
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2042cae9 CPack-FreeBSD: add a generator for FreeBSD pkg(8) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !693
| * | | | CPack-FreeBSD: add a generator for FreeBSD pkg(8)Adriaan de Groot2017-06-1010-0/+696
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option CPACK_ENABLE_FREEBSD_PKG to allow CPack to look for FreeBSD's libpkg / pkg(8). If this is set and the libpkg headers and library are found (which they will be, by default, on any FreeBSD system), then add a FreeBSD pkg(8) generator. The FreeBSD package tool pkg(8) uses tar.xz files (.txz) with two metadata files embedded (+MANIFEST and +COMPACT_MANIFEST). This introduces a bunch of FreeBSD-specific CPACK_FREEBSD_PACKAGE_* variables for filling in the metadata; the Debian generator does something similar. Documentation for the CPack CMake-script is styled after the Debian generator. Implementation notes: - Checks for libpkg -- the underlying implementation for pkg(8) -- and includes FreeBSD package-generation if building CMake on a UNIX host. Since libpkg can be used on BSDs, Linux and OSX, this potentially adds one more packaging format. In practice, this will only happen on FreeBSD and DragonflyBSD. - Copy-paste from cmCPackArchiveGenerator to special-case the metadata generation and to run around the internal archive generation: use libpkg instead. - Generating the metadata files is a little contrived. - Most of the validation logic for package settings is in CPackFreeBSD.cmake, as well as the code that tries to re-use packaging settings that may already be set up for Debian. - libpkg has its own notion of output filename, so we have another contrived bit of code that munges the output file list so that CPack can find the output. - Stick with C++98.
* | | | Merge topic 'cuda-compiler-launcher'Brad King2017-06-1213-9/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 414438b2 CUDA: Add option to run the compiler through launcher tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !949
| * | | | CUDA: Add option to run the compiler through launcher toolsBrad King2017-06-0913-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CUDA_COMPILER_LAUNCHER` target property like those added for C and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler through tools like ccache or distcc, 2015-06-04). Fixes: #16953
* | | | | Merge topic 'FindHTMLHelp-path-suffixes'Brad King2017-06-121-14/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcbecbd2 FindHTMLHelp: Use PATH_SUFFIXES to search under Program Files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !948
| * | | | | FindHTMLHelp: Use PATH_SUFFIXES to search under Program FilesBrad King2017-06-091-14/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find commands already know how to search in variants of the Program Files folders on Windows. Use PATH_SUFFIXES to tell them under what directory within Program Files to find htmlhelp. Fixes: #16950
* | | | | Merge topic 'update-kwsys'Brad King2017-06-122-15/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d1c3e0d Merge branch 'upstream-KWSys' into update-kwsys a3275878 KWSys 2017-06-09 (a700e2ab) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !947
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-06-092-15/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-06-09 (a700e2ab)
| | * | | | KWSys 2017-06-09 (a700e2ab)KWSys Upstream2017-06-092-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit a700e2ab06e2741e4955a1aa120293bf78b8fcac (master). Upstream Shortlog ----------------- Brad King (1): 7e04a3d2 SystemTools: Remove RemoveEmptyPathElements method
* | | | | | Merge topic 'file-generate-relative-paths'Brad King2017-06-1232-19/+217
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82be694c file(GENERATE): Add policy CMP0070 to define relative path behavior 69050f4d Tests: Use full output paths in file(GENERATE) calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !943
| * | | | | | file(GENERATE): Add policy CMP0070 to define relative path behaviorBrad King2017-06-0917-3/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `file(GENERATE)` did not define any behavior for relative paths given to the `OUTPUT` or `INPUT` arguments. Define behavior consistent with CMake conventions and add a policy to provide compatibility for projects that relied on the old accidental behavior. Fixes: #16786
| * | | | | | Tests: Use full output paths in file(GENERATE) callsBrad King2017-06-0815-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't define behavior for relative paths to the OUTPUT argument. Fix our tests to use full paths.
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-121-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-111-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-101-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'file-generate-path-cleanup'Brad King2017-06-091-5/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c41a7c7d file: Normalize GENERATE command input and output file paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !940
| * | | | | file: Normalize GENERATE command input and output file pathsBrad King2017-06-081-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize absolute paths so that no extra components like `../` or `...//...` appear that later confuse relative path computation. In particular, we expect paths sent to AddCMakeDependFile and AddCMakeOutputFile to be normalized. Do this only for paths that are already absolute because we can't handle relative paths yet (see #16786). Fixes: #16892
* | | | | | Merge topic 'sdcc-simplify-link-flags'Brad King2017-06-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0436a2f SDCC: Remove superfluous whitespace from link line dcf559d0 SDCC: Do not explicitly ask linker to generate Intel Hex files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !942
| * | | | | | SDCC: Remove superfluous whitespace from link lineReto Schneider2017-06-081-1/+1
| | | | | | |
| * | | | | | SDCC: Do not explicitly ask linker to generate Intel Hex filesReto Schneider2017-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--out-fmt-ihx` option added by commit v2.6.0~1253 (...use --out-fmt-ihx to enforce .ihx files, 2007-08-15) may interfere with options requested by the user. Also, when no linker output is specified, SDCC outputs Intel Hex by default anyway.
* | | | | | | Merge topic 'qt-pass-point-by-value'Brad King2017-06-092-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 994beddb CMakeSetupDialog: Pass QPoint by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !946
| * | | | | | | CMakeSetupDialog: Pass QPoint by valueDaniel Pfeifer2017-06-082-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'no-return-void-expression'Brad King2017-06-092-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b02bcf6 QtDialog/FirstConfigure: remove 'return' from void expression 2d1c05c1 cmGlobalGenerator: remove 'return' from void expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !941
| * | | | | | | QtDialog/FirstConfigure: remove 'return' from void expressionDaniel Pfeifer2017-06-081-1/+1
| | | | | | | |
| * | | | | | | cmGlobalGenerator: remove 'return' from void expressionDaniel Pfeifer2017-06-081-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'cpack-destructor-overrides'Brad King2017-06-098-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62eec34c Add CM_OVERRIDE to CPack generator destructors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !939
| * | | | | | | Add CM_OVERRIDE to CPack generator destructorsBrad King2017-06-088-8/+8
| |/ / / / / /
* | | | | | | Merge branch 'release-3.9'Brad King2017-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'FindDoxygen-imported-target-once' into release-3.9Brad King2017-06-091-16/+24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'improve-msvc-feature-checks' into release-3.9Brad King2017-06-081-1/+3
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'bootstrap-cleanup'Brad King2017-06-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83784ed1 bootstrap: remove leftover empty variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !944
| * | | | | | | | | bootstrap: remove leftover empty variable dereferenceRolf Eike Beer2017-06-081-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in 9c0d1e7531edbebc7943d5b981353b17631ed632 when the for loop that used this as loop variable was removed.
* | | | | | | | | Merge topic 'FindDoxygen-imported-target-once'Brad King2017-06-091-16/+24
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 522c92d7 FindDoxygen: Create imported targets at most once in a given scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !945
| * | | | | | | | FindDoxygen: Create imported targets at most once in a given scopeBrad King2017-06-091-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) need to be guarded against duplicate creation on multiple inclusion.
* | | | | | | | | Merge topic 'improve-msvc-feature-checks'Brad King2017-06-091-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f44d9bcc C++ feature checks: Improve exclusion of "0 Warning(s)" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !938
| * | | | | | | | C++ feature checks: Improve exclusion of "0 Warning(s)"Brad King2017-06-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply matching "0 Warning" may match "10 Warning(s)". Instead remove the entire ` 0 Warning(s)` content from the MSBuild output before searching it for warnings. Issue: #16942
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-06-091-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'bootstrap-cleanup'Brad King2017-06-081-32/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c0d1e75 bootstrap: implement cmake_extract_standard_flags() without loop 567bac89 bootstrap: use "grep -q" instead of output redirection 380bd70c bootstrap: implement cmake_toupper() using tr e61979a7 bootstrap: don't use 'cat x | sed', let sed open the file instead Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !937
| * | | | | | | | bootstrap: implement cmake_extract_standard_flags() without loopRolf Eike Beer2017-06-071-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass all files to sed at once, and don't even change the directory for this.
| * | | | | | | | bootstrap: use "grep -q" instead of output redirectionRolf Eike Beer2017-06-071-10/+10
| | | | | | | | |
| * | | | | | | | bootstrap: implement cmake_toupper() using trRolf Eike Beer2017-06-071-1/+1
| | | | | | | | |
generated by cgit v0.12 at 2025-01-19 03:15:02 (GMT)