summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update-third-party: Add helper to disable custom gitattributesBrad King2017-03-241-0/+8
| | | | | | | | Provide a helper function that import scripts can use when the third-party project defines custom Git attributes in its top-level `.gitattributes` file. These must be commented out because Git does not support custom attributes in a subdirectory where we where the third-party project is about to be merged.
* Merge branch 'release'Brad King2017-03-240-0/+0
|\
| * CMake 3.8.0-rc3v3.8.0-rc3Brad King2017-03-241-1/+1
| |
* | Merge topic 'binaries-from-gitlab-repo'Brad King2017-03-241-1/+2
|\ \ | | | | | | | | | | | | | | | | | | 954185d4 Utilities/Release: Fetch stage/master/head Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !621
| * | Utilities/Release: Fetch stage/master/headBrad King2017-03-241-1/+2
| | | | | | | | | | | | | | | | | | | | | Update our release scripts to fetch `refs/stage/master/head` from the `gitlab.kitware.com` repository. This will allow us to prepare releases from staged commits before merging them to `master` or `release`.
* | | Merge branch 'release'Brad King2017-03-240-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into releaseBrad King2017-03-231-2/+2
| |\ \
| * \ \ Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-231-69/+109
| |\ \ \
* | \ \ \ Merge topic 'iwyu'Brad King2017-03-2410-44/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41ec3528 IWYU: use pragma export 72ea66b1 Autogen: include what you use 2a827b82 cmCPackGenerator: Move macros to bottom of file bcd08aa3 cmCTest: Move macros to bottom of file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !619
| * | | | | IWYU: use pragma exportDaniel Pfeifer2017-03-235-5/+3
| | | | | |
| * | | | | Autogen: include what you useDaniel Pfeifer2017-03-233-9/+3
| | | | | |
| * | | | | cmCPackGenerator: Move macros to bottom of fileDaniel Pfeifer2017-03-231-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the class name is used in the macros, the iwyu tool gets confused wheter it needs a forward declaration or not.
| * | | | | cmCTest: Move macros to bottom of fileDaniel Pfeifer2017-03-231-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the class name is used in the macros, the iwyu tool gets confused wheter it needs a forward declaration or not.
* | | | | | Merge topic '16680-ios-bundle-resources'Brad King2017-03-2413-5/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5189fda Apple: Add test for bundle resource layout c51c2cfa Apple: Fix Resources location for all generators 060be58c Xcode: Properly handle Bundle Resources with more than one hierarchy level 484ccb0c Xcode: Properly handle non-resource Bundle files on iOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !613
| * | | | | | Apple: Add test for bundle resource layoutGregor Jasny2017-03-236-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16680
| * | | | | | Apple: Fix Resources location for all generatorsGregor Jasny2017-03-236-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16680
| * | | | | | Xcode: Properly handle Bundle Resources with more than one hierarchy levelGregor Jasny2017-03-223-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16680
| * | | | | | Xcode: Properly handle non-resource Bundle files on iOSGregor Jasny2017-03-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16680
* | | | | | | Merge topic 'autogen_rcc_test'Brad King2017-03-247-47/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35e8a6de Autogen: Tests: More rigorous rcc rebuild tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !618
| * | | | | | | Autogen: Tests: More rigorous rcc rebuild testsSebastian Holtermann2017-03-237-47/+93
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Closes: #16103
* | | | | | | Merge topic 'cpack-rpm-correct-error-message-debug-lengths'Brad King2017-03-241-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dc23a43 CPack/RPM: fix error message associated with source path length Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Domen Vrankar <domen.vrankar@gmail.com> Merge-request: !614
| * | | | | | CPack/RPM: fix error message associated with source path lengthDaniel Black2017-03-231-2/+2
| | | | | | |
* | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs2017'Brad King2017-03-241-69/+109
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4a693a0 InstallRequiredSystemLibraries: Add support for VS 2017 5ed4e481 InstallRequiredSystemLibraries: Split MFC redist dir variable dbdb880a InstallRequiredSystemLibraries: Split VS IDE and DLL versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !616
| * | | | | | InstallRequiredSystemLibraries: Add support for VS 2017Brad King2017-03-231-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*` directories but still uses version number `140` in the DLL names. The redist directories now have version numbers in their name, and the MSVC and MFC runtime DLLs may be in directories with different versions. Fill out our logic to handle this. For now assume we are given the `MSVC_REDIST_DIR` value as a cache entry. Unfortunately we cannot yet find the VS 2017 MSVC redist directory automatically since there is no registry entry for the VS installation. Later we will have to use `cmVSSetupHelper` for this. Issue: #16735
| * | | | | | InstallRequiredSystemLibraries: Split MFC redist dir variableBrad King2017-03-231-3/+5
| | | | | | |
| * | | | | | InstallRequiredSystemLibraries: Split VS IDE and DLL versionsBrad King2017-03-231-66/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MSVC logic to split the IDE and DLL version variables.
* | | | | | | Merge topic 'make_sure_cuda_tests_run'Brad King2017-03-241-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d40fc885 CUDA: ObjectLibrary test executable now runs on OSX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !615
| * | | | | | | CUDA: ObjectLibrary test executable now runs on OSXRobert Maynard2017-03-231-0/+5
| | | | | | | |
* | | | | | | | Merge topic 'suppress-xcode-error'Brad King2017-03-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ede8db10 RunCMake: Ignore xcodebuild bug warnings in tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !617
| * | | | | | | | RunCMake: Ignore xcodebuild bug warnings in testsGregor Jasny2017-03-241-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encountered on OS X 10.4 with old Xcode: Expected stderr to match: expect-err> ^$ Actual stderr: actual-err> Hit xcodebuild bug : ... bad interpreter: Text file busy
* | | | | | | | CMake Nightly Date StampKitware Robot2017-03-241-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'release'Brad King2017-03-230-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'server-mode-fix-home-dir-check' into releaseBrad King2017-03-231-2/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'InstallRequiredSystemLibraries-refactor' into releaseBrad King2017-03-231-179/+176
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'avoid-MSVC-per-version-vars' into releaseBrad King2017-03-233-11/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'doc-prefer-MSVC_VERSION' into releaseBrad King2017-03-2211-3/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindwxWidgets-vs-2017' into releaseBrad King2017-03-221-5/+7
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'server-mode-fix-home-dir-check'Brad King2017-03-231-2/+22
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !611
| * | | | | | | | | | server-mode: Make CMAKE_HOME_DIRECTORY more reliableTobias Hunger2017-03-221-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CMAKE_HOME_DIRECTORY detection work more reliably in the face of symlinks. Closes #16736
* | | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-refactor'Brad King2017-03-231-179/+176
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2aad448 InstallRequiredSystemLibraries: Drop version from variable names 16eb58d5 InstallRequiredSystemLibraries: Refactor to avoid macros a259e8db InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !612
| * | | | | | | | | | InstallRequiredSystemLibraries: Drop version from variable namesBrad King2017-03-221-122/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each `MSVC${v}_*_DIR` variable is only ever used with one value for `${v}` within a given build tree. Drop the `${v}` version component from the variable names.
| * | | | | | | | | | InstallRequiredSystemLibraries: Refactor to avoid macrosBrad King2017-03-221-58/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a given `MSVC_VERSION` our macros were each called at most once. Replace them with a single code path that is parameterized over what was the macro argument.
| * | | | | | | | | | InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-221-22/+22
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16735
* | | | | | | | | | Merge topic 'doc-prefer-MSVC_VERSION'Brad King2017-03-2311-3/+25
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fecf8467 Help: Document preference of `MSVC_VERSION` over `MSVC##` 712452e3 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset 49a60b70 MSVC: Exclude future cl 20+ from MSVC14 variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !609
| * | | | | | | | | Help: Document preference of `MSVC_VERSION` over `MSVC##`Brad King2017-03-2210-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16735
| * | | | | | | | | Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolsetBrad King2017-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16735
| * | | | | | | | | MSVC: Exclude future cl 20+ from MSVC14 variableBrad King2017-03-221-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge topic 'avoid-MSVC-per-version-vars'Brad King2017-03-233-11/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab966a7 FindRuby: Use `MSVC_VERSION` instead of `MSVC##` 69b9fde1 FindGTK2: Use `MSVC_VERSION` instead of `MSVC##` 3fe31822 FindBoost: Avoid mentioning discouraged `MSVC##`` variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !610
| * | | | | | | | | FindRuby: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-231-5/+5
| | | | | | | | | |
| * | | | | | | | | FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-231-5/+5
| | | | | | | | | |
generated by cgit v0.12 at 2025-01-11 19:08:05 (GMT)