summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATHRobert Maynard2020-05-195-1/+49
|
* Merge topic 'add_unity_mode_examples'Brad King2020-05-121-2/+38
|\ | | | | | | | | | | | | caf5d3f71b Help: Add an example for each UNITY_BUILD_MODE setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4733
| * Help: Add an example for each UNITY_BUILD_MODE settingRobert Maynard2020-05-111-2/+38
| |
* | Merge topic 'refactor_cmSetPropertiesCommands'Brad King2020-05-124-215/+91
|\ \ | | | | | | | | | | | | | | | | | | 300bf4e94f set_*_properties: simplify and shorten implementations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4728
| * | set_*_properties: simplify and shorten implementationsTushar Maheshwari2020-05-124-215/+91
| | | | | | | | | | | | | | | Optimize argument copies and range traversal. Inline the single use file static functions.
* | | Merge branch 'release-3.16'Brad King2020-05-120-0/+0
|\ \ \
| * \ \ Merge branch 'pch-msvc-pragma' into release-3.16Brad King2020-05-111-7/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4736
| * \ \ \ Merge branch 'vs-pch-compile-opts' into release-3.16Brad King2020-05-112-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4734
* | \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'vs-pch-compile-opts' into release-3.17Brad King2020-05-122-1/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
* | | | | | | Merge topic 'vs-pch-compile-opts'Brad King2020-05-122-1/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
| * | | | | | VS: Fix using PCH from source with COMPILE_OPTIONSBrad King2020-05-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file gets per-source flags from both PCH and custom `COMPILE_OPTIONS`, combine them correctly. Fixes: #20694, #20456
* | | | | | | Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'pch-msvc-pragma' into release-3.17Brad King2020-05-121-7/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
* | | | | | | Merge topic 'pch-msvc-pragma'Brad King2020-05-121-7/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
| * | | | | | MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and aboveBrad King2020-05-111-7/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 15.6 introduced support for this pragma. Older MSVC versions warn that it is unknown. Fixes: #20692
* | | | | | Merge branch 'release-3.17'Brad King2020-05-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'xl-cpp-install' into release-3.17Brad King2020-05-121-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4735
* | \ \ \ \ \ Merge topic 'xl-cpp-install'Brad King2020-05-121-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4735
| * | | | | | XL: Install our Fortran 'cpp' helper script with execute permissionBrad King2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script was added by commit 19f267c75e (XL: Add support for Ninja and XL Fortran, 2019-11-21, v3.17.0-rc1~368^2) but does not have a `.sh` extension so our existing install rules neglect to give it execute permission. Our test suite works on XL Fortran in the build tree but the script is broken without execute permission on installation. Fixes: #20695
* | | | | | | Merge topic 'system-zlib-qt-warnings'Brad King2020-05-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 029928b706 CTestCustom: Suppress warning about zlib symbol conflict with QtCore Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4732
| * | | | | | | CTestCustom: Suppress warning about zlib symbol conflict with QtCoreBrad King2020-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building `cmake-gui` with system-installed `zlib` and `QtCore`, the latter has a different copy of zlib that conflicts and produces warnings on Solaris. Suppress them from report to CDash to clean up nightly builds.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-121-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'doxygen-generated-sources'Brad King2020-05-112-8/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE 683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4726
| * | | | | | | FindDoxygen: Allow generated files with USE_STAMP_FILECraig Scott2020-05-092-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20597
| * | | | | | | FindDoxygen: Formatting-only indentation cleanup for test caseCraig Scott2020-05-091-4/+4
| | | | | | | |
* | | | | | | | Merge topic 'source_group_forward_slashes'Brad King2020-05-116-7/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faf44a8cdb source_group: Support forward slashes in group hierarchy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4727
| * | | | | | | | source_group: Support forward slashes in group hierarchyCraig Scott2020-05-106-7/+26
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | Fixes: #18076
* | | | | | | | Merge branch 'release-3.16'Brad King2020-05-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'FindGTK2-harfbuzz-target' into release-3.16Brad King2020-05-091-3/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4725
* | \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindGTK2-harfbuzz-target' into release-3.17Brad King2020-05-111-3/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4725
* | | | | | | | | Merge topic 'FindGTK2-harfbuzz-target'Brad King2020-05-111-3/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4725
| * | | | | | | | FindGTK2: Add harfbuzz target for dependency from pangoBrad King2020-05-091-3/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531
* | | | | | | | Merge topic 'unity_explicit_groups'Brad King2020-05-1127-46/+581
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f4eb352fe Unity Builds: Support explicit specification of sources to groups b00585adcc Unity: Refactor implementation to make it easier to extend Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4716
| * | | | | | | Unity Builds: Support explicit specification of sources to groupsRobert Maynard2020-05-0727-5/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having CMake determine which files should go into each unity file, the user can now use explicitly state the mapping.
| * | | | | | | Unity: Refactor implementation to make it easier to extendRobert Maynard2020-05-061-45/+74
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-111-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'doc-option-existing-var'Craig Scott2020-05-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36a6d91011 Help: If a cache variable exists, option() also does nothing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4721
| * | | | | | | Help: If a cache variable exists, option() also does nothingHong Xu2020-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous text sounded as if option() does some work when a cache variable exists.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-101-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-091-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'sphinx-builder-linux-3.17'Brad King2020-05-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20fbf69f67 gitlab-ci: add linux-3.17 tag to the sphinx build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4722
| * | | | | | | gitlab-ci: add linux-3.17 tag to the sphinx buildBen Boeckel2020-05-081-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This build uses Qt libraries in a Fedora container. This library is tagged with a note which says it requires Linux 3.17. Some of or CI runners do not have this kernel on the host which causes glibc to refuse to load it. Add a tag to indicate that we need a newer kernel on the runner.
* | | | | | | Merge topic 'install-rpath-escape-doc'Brad King2020-05-081-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4720
| * | | | | | | Help: Mention CMP0095 in INSTALL_RPATH documentationKyle Edwards2020-05-071-0/+4
| |/ / / / / /
* | | | | | | Merge topic 'third-parties-layout'Brad King2020-05-08129-286/+306
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix 75e87e3db4 bootstrap: update list of problematic files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4705
| * | | | | | | Refactoring: Third-parties public headers are under cm3p prefixMarc Chevrier2020-05-07128-284/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20666
| * | | | | | | bootstrap: update list of problematic filesMarc Chevrier2020-05-071-2/+6
| | | | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-05-080-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
generated by cgit v0.12 at 2025-02-05 06:27:49 (GMT)