summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | Merge topic 'doc_bundle_wrong_plist_property'Brad King2017-10-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a56d9ecf Help: Fix wrong property reference for an app bundle's Info.plist Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1362
| * | | | | | | | | | | | | | Help: Fix wrong property reference for an app bundle's Info.plistCraig Scott2017-10-071-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge topic 'target_properties_doc_cleanup'Brad King2017-10-102-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8010bda Help: Fix Example appearing in target property list of contents Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1361
| * | | | | | | | | | | | | Help: Fix Example appearing in target property list of contentsCraig Scott2017-10-072-2/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'FindProtobuf-doc-typo'Brad King2017-10-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 107fe8d5 FindProtobuf: fix documentation typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1359
| * | | | | | | | | | | | FindProtobuf: fix documentation typoAndré Apitzsch2017-10-061-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in documentation added by commit v3.10.0-rc1~18^2 (FindProtobuf: add flag to allow descriptor files to be generated, 2017-09-21).
* | | | | | | | | | | | Merge topic 'ipo-escape-toolchain-path'Brad King2017-10-102-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11f4c19d IPO: Fix support for spaces in path to archive tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !1356
| * | | | | | | | | | | IPO: Fix support for spaces in path to archive toolsThomas Stenersen2017-10-062-6/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the normal archiving rules the ``<CMAKE_AR>`` placeholder is replaced by the generators with a properly-quoted path to the tool. In the IPO rules we specify the tools directly, so we need to quote them. Fixes: #17326
* | | | | | | | | | | Merge topic 'FindCUDA-cuda-9-nppi'Brad King2017-10-101-1/+39
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1360
| * | | | | | | | | | FindCUDA: Update for CUDA 9 breakup of nppi into multiple librariesRobert Maynard2017-10-061-1/+39
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17310
* | | | | | | | | | Merge topic 'FindJava-tolerant-versions'Brad King2017-10-101-25/+42
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6feb0c33 FindJava: Revise version parsing to support Java 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1355
| * | | | | | | | | FindJava: Revise version parsing to support Java 9Brad King2017-10-061-25/+42
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 9 has only one component. Revise the logic to tolerate any number of version components 1 through 4. Fix the parsing of individual components. Fixes: #17325
* | | | | | | | | Merge topic 'revise-3.10-relnotes'Brad King2017-10-101-19/+10
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 3cebe2ab Help: Revise 3.10 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1357
| * | | | | | | Help: Revise 3.10 release notesBrad King2017-10-061-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce duplication of `AUTOMOC` feature text. Clarify QtIFW version requirements.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-10-101-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-10-091-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.10'Brad King2017-10-060-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v0.12 at 2025-01-21 11:02:53 (GMT)