summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCPackDragNDropGenerator: Improve error reportingClinton Stimpson2017-10-121-6/+14
| | | | When running hdiutil and other commands, capture errors and log them.
* Merge branch 'release-3.10'Brad King2017-10-110-0/+0
|\
| * Merge branch 'cpack-deb-mr-1296-fix' into release-3.10Brad King2017-10-115-6/+54
| |\ | | | | | | | | | Merge-request: !1375
| * \ Merge branch 'ExternalProject-CMP0054' into release-3.10Brad King2017-10-111-0/+5
| |\ \ | | | | | | | | | | | | Merge-request: !1369
| * \ \ Merge branch 'update-curl' into release-3.10Brad King2017-10-11144-5795/+7998
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1372
| * \ \ \ Merge branch 'autogen-skip-ui' into release-3.10Brad King2017-10-108-15/+78
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1366
| * \ \ \ \ Merge branch 'doc-lang-clarify' into release-3.10Brad King2017-10-101-8/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1358
| * \ \ \ \ \ Merge branch 'xcode-tests-ios-deployment-target' into release-3.10Brad King2017-10-105-27/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1365
* | \ \ \ \ \ \ Merge topic 'cpack-deb-mr-1296-fix'Brad King2017-10-115-6/+54
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present 529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1375
| * | | | | | | CPack/Deb: fix for regex passing even if invalid characters are presentDomen Vrankar2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regex [+-~] passes all characters between + and ~ and not only +, - and ~
| * | | | | | | CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exceptionDomen Vrankar2017-10-105-6/+54
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also contain release and epoch version so regex test should expect the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE and CPACK_DEBIAN_PACKAGE_EPOCH are not set. Also since the checks were not performed in the past the regex test of CPACK_DEBIAN_PACKAGE_VERSION variable content should only report author warnings instead of errors in case of the test fail. Fixes: #17339
* | | | | | | Merge topic 'linked-tree'Brad King2017-10-111-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1351
| * | | | | | | cmLinkedTree: avoid unnecessary copies during Push of TMatthias Maennich2017-10-091-3/+3
| | | | | | | |
* | | | | | | | Merge topic 'simplify-env-var-determination'Brad King2017-10-112-19/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1350
| * | | | | | | | cm{Unset,Set}Command: use std::string to determine the env variable nameMatthias Maennich2017-10-102-19/+8
| |/ / / / / / /
* | | | | | | | Merge topic 'ExternalProject-CMP0054'Brad King2017-10-111-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1369
| * | | | | | | ExternalProject: Avoid if() auto-dereferene in quoted argumentsBrad King2017-10-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of this module doesn't expect such dereferences to happen, but can when a project sets a variable called `x`. Set `CMP0054` explicitly to get its NEW behavior. Fixes: #17335
* | | | | | | | Merge topic 'UseJava_OUTPUT_DIR'Brad King2017-10-113-0/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dead049e UseJava: OUTPUT_DIR must exists in all cases. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1368
| * | | | | | | | UseJava: OUTPUT_DIR must exists in all cases.Marc Chevrier2017-10-103-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17316
* | | | | | | | | Merge topic 'autogen-skip-ui'Brad King2017-10-118-15/+78
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation 814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS 1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1366
| * | | | | | | | Autogen: Docs: Extend SKIP_AUTOUIC documentationSebastian Holtermann2017-10-101-0/+5
| | | | | | | | |
| * | | | | | | | Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONSSebastian Holtermann2017-10-096-9/+63
| | | | | | | | |
| * | | | | | | | Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sourcesSebastian Holtermann2017-10-091-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SKIP_AUTOUIC and SKIP_AUTOGEN were ignored when set on a `.ui` file that was not in the sources of the target.
* | | | | | | | | Merge topic 'update-kwsys'Brad King2017-10-118-43/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1a4ecdc Merge branch 'upstream-KWSys' into update-kwsys c551ff58 KWSys 2017-10-10 (239bc737) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1370
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-10-108-43/+35
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-10-10 (239bc737)
| | * | | | | | | | KWSys 2017-10-10 (239bc737)KWSys Upstream2017-10-108-43/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 239bc737543886a72c5e9e3445d51e17f7e26abe (master). Upstream Shortlog ----------------- Matthias Maennich (5): 6599eda6 testRobustEncoding: restore format flags for std::cout before exiting 862562ce SystemInformation: fix potential off-by-one write 13e02b76 processUNIX: close intermediate file descriptor in error case 73c491e8 processUNIX: fix not null terminated buffer during error reporting ce55a255 testSystemTools: fix some copy'n'paste issues Rolf Eike Beer (5): 6ca15069 SystemTools: make Getcwd() more efficient on Windows 6d7eb3a1 CommandLineArguments: do not check variable before delete[] 3b8fefea remove pointer checks before calling free() cf8beae3 ProcessUNIX: use strdup() instead of open coding it 5d2aff9d ProcessWin32: use strdup() instead of open coding it
* | | | | | | | | | Merge topic 'update-curl'Brad King2017-10-11144-5795/+7998
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb759148 curl: Update build within CMake to account for 7.56 changes 9e3ef40e Merge branch 'upstream-curl' into update-curl de7c21d6 curl 2017-10-04 (3ea76790) 2fad0e20 curl: Update script to get curl 7.56.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1372
| * | | | | | | | | curl: Update build within CMake to account for 7.56 changesBrad King2017-10-102-1/+5
| | | | | | | | | |
| * | | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2017-10-10143-5793/+7984
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
| | * | | | | | | | | curl 2017-10-04 (3ea76790)Curl Upstream2017-10-10143-5808/+7983
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 3ea76790571c1f7cf1bed34fabffd3cc20ad3dd3 (curl-7_56_0).
| * | | | | | | | | | curl: Update script to get curl 7.56.0Brad King2017-10-101-2/+10
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'test-tolerate-clang-sanitizers'Brad King2017-10-111-1/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0be7d61a Tests: Teach RunCMake to ignore clang unused sanitizer flag warnings 3f567a98 Tests: Refactor RunCMake output line ignore regex construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1371
| * | | | | | | | | | Tests: Teach RunCMake to ignore clang unused sanitizer flag warningsBrad King2017-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can show up in Release builds of CMake because some tests still build Debug.
| * | | | | | | | | | Tests: Refactor RunCMake output line ignore regex constructionBrad King2017-10-101-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid one giant line.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-10-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'doc-lang-clarify'Brad King2017-10-101-8/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ed11f1c Help: Minor text clarifications in cmake-language(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1358
| * | | | | | | | | Help: Minor text clarifications in cmake-language(7) manualBrad King2017-10-101-8/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify definitions of `bracket_open` and `bracket_close` productions. In note about unquoted arguments containing unescaped double quotes, provide examples of how they can be written as quoted arguments. Also clarify location of nested calls supported by variable function scope. Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
* | | | | | | | | Merge topic 'tryrun-strcpy'Brad King2017-10-101-4/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a483b7ea TryRun: do not call strcpy() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1364
| * | | | | | | | | TryRun: do not call strcpy()Rolf Eike Beer2017-10-081-4/+5
| | | | | | | | | |
* | | | | | | | | | Merge topic 'xcode-tests-ios-deployment-target'Brad King2017-10-105-27/+20
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a49b4eb Xcode 9: Lower iOS deployment version to get armv7 builds 78a560e4 Revert "Xcode: Adjust tests to drop of 32bit iOS architectures" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1365
| * | | | | | | | | Xcode 9: Lower iOS deployment version to get armv7 buildsGregor Jasny2017-10-101-5/+16
| | | | | | | | | |
| * | | | | | | | | Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"Gregor Jasny2017-10-105-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d210b2813072c874ee13fcc941e41aacacf09874.
* | | | | | | | | | Merge branch 'release-3.10'Brad King2017-10-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'target_properties_doc_cleanup' into release-3.10Brad King2017-10-102-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1361
| * \ \ \ \ \ \ \ \ \ Merge branch 'doc_bundle_wrong_plist_property' into release-3.10Brad King2017-10-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1362
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10Brad King2017-10-101-1/+39
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1360
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindProtobuf-doc-typo' into release-3.10Brad King2017-10-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1359
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ipo-escape-toolchain-path' into release-3.10Brad King2017-10-062-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1356
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindJava-tolerant-versions' into release-3.10Brad King2017-10-061-25/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1355
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'revise-3.10-relnotes' into release-3.10Brad King2017-10-061-19/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1357