summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-rpm-debuginfo-honor-package-filename'Brad King2017-03-274-5/+62
|\ | | | | | | | | | | | | | | f237f5f8 CPack/RPM: support for debuginfo package renaming 6c09c5d6 CPack/RPM honor package file name on debuginfo enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !620
| * CPack/RPM: support for debuginfo package renamingDomen Vrankar2017-03-254-2/+51
| |
| * CPack/RPM honor package file name on debuginfo enabledDomen Vrankar2017-03-243-4/+12
| | | | | | | | | | | | | | | | Packages with debuginfo enabled should still honor defined package file name if file name is not set to RPM-DEFAULT. Fixes #16715
* | Merge topic 'cpack-rpm-tests-handle-build-id-links'Brad King2017-03-273-5/+11
|\ \ | | | | | | | | | | | | | | | | | | 4ba065b2 CPack/RPM tests: handle build-id links Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !628
| * | CPack/RPM tests: handle build-id linksDomen Vrankar2017-03-273-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Build id links generation was introduced in rpm 4.13.0.1 so files related to them should be ignored as they are not relevant for the tests. Fixes #16710
* | | Merge topic 'cm-sys-stat'Brad King2017-03-2717-39/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e9fc7ff5 Add self-sufficient wrapper for <sys/stat.h> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !625
| * | | Add self-sufficient wrapper for <sys/stat.h>Daniel Pfeifer2017-03-2417-39/+29
| | | |
* | | | Merge topic 'cpack-rpm-debuginfo-docs-cleanup'Brad King2017-03-271-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e0fc685 CPack/RPM can now generate a single debuginfo package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !630
| * | | | CPack/RPM can now generate a single debuginfo packageDomen Vrankar2017-03-271-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.8 introduced possibility of generating a single debuginfo package even if component packaging is enabled so this note no longer applies.
* | | | | Merge topic 'update-kwsys'Brad King2017-03-276-12/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys fda80fde KWSys 2017-03-24 (7e9f7b7b) 64490637 update-kwsys: Disable custom gitattributes during import f1a55839 update-third-party: Add helper to disable custom gitattributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !624
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-244-12/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-03-24 (7e9f7b7b) Resolve conflicts in `.gitattributes` by integrating changes from both sides. Keep the `our-c-style` attribute that KWSys uses, but drop their definition of it in favor of ours (Git only allows custom attributes in the top level anyway). Then add our own attribute line to unset the `format.clang-format` attribute for KWSys sources since we do not want to format third-party code ourselves.
| | * | | | | KWSys 2017-03-24 (7e9f7b7b)KWSys Upstream2017-03-244-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master). Upstream Shortlog ----------------- Brad King (3): 0af48083 Drop custom Git whitespace check attribute 6365886c Define a custom Git attribute to mark sources using our C style d22c2743 clang-format.bash: Use Git attributes to mark files for formatting Egor Pugin (3): ce44c58a FStream: Export ReadBOM() from shared library 04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template 858d5edd Encoding: Export CommandLineArguments from shared library
| * | | | | | update-kwsys: Disable custom gitattributes during importBrad King2017-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KWSys `.gitattributes` file now defines custom attributes. Git does not support these in a subdirectory where we are about to place the content, so comment them out during import. This also ensures that the `our-c-style` attribute on KWSys sources does not activate the `format.clang-format` attribute on the third-party import branch.
| * | | | | | 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 topic 'InstallRequiredSystemLibraries-test-openmp'Brad King2017-03-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70d8f0d0 Tests: Activate InstallRequiredSystemLibraries OpenMP libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !623
| * | | | | | Tests: Activate InstallRequiredSystemLibraries OpenMP libsBrad King2017-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SimpleInstall test performs a smoke test of this module. Activate the OpenMP code paths.
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-261-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-251-1/+1
| |/ / / / / |/| | | | |
* | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
generated by cgit v0.12 at 2025-01-31 03:38:00 (GMT)