summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'sdcc-simplify-link-flags'Brad King2017-06-091-1/+1
|\ | | | | | | | | | | | | | | a0436a2f SDCC: Remove superfluous whitespace from link line dcf559d0 SDCC: Do not explicitly ask linker to generate Intel Hex files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !942
| * SDCC: Remove superfluous whitespace from link lineReto Schneider2017-06-081-1/+1
| |
| * SDCC: Do not explicitly ask linker to generate Intel Hex filesReto Schneider2017-06-081-1/+1
| | | | | | | | | | | | | | The `--out-fmt-ihx` option added by commit v2.6.0~1253 (...use --out-fmt-ihx to enforce .ihx files, 2007-08-15) may interfere with options requested by the user. Also, when no linker output is specified, SDCC outputs Intel Hex by default anyway.
* | Merge topic 'qt-pass-point-by-value'Brad King2017-06-092-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 994beddb CMakeSetupDialog: Pass QPoint by value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !946
| * | CMakeSetupDialog: Pass QPoint by valueDaniel Pfeifer2017-06-082-2/+2
| | |
* | | Merge topic 'no-return-void-expression'Brad King2017-06-092-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b02bcf6 QtDialog/FirstConfigure: remove 'return' from void expression 2d1c05c1 cmGlobalGenerator: remove 'return' from void expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !941
| * | | QtDialog/FirstConfigure: remove 'return' from void expressionDaniel Pfeifer2017-06-081-1/+1
| | | |
| * | | cmGlobalGenerator: remove 'return' from void expressionDaniel Pfeifer2017-06-081-1/+1
| |/ /
* | | Merge topic 'cpack-destructor-overrides'Brad King2017-06-098-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 62eec34c Add CM_OVERRIDE to CPack generator destructors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !939
| * | | Add CM_OVERRIDE to CPack generator destructorsBrad King2017-06-088-8/+8
| |/ /
* | | Merge branch 'release-3.9'Brad King2017-06-090-0/+0
|\ \ \
| * \ \ Merge branch 'FindDoxygen-imported-target-once' into release-3.9Brad King2017-06-091-16/+24
| |\ \ \
| * \ \ \ Merge branch 'improve-msvc-feature-checks' into release-3.9Brad King2017-06-081-1/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'bootstrap-cleanup'Brad King2017-06-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83784ed1 bootstrap: remove leftover empty variable dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !944
| * | | | | | bootstrap: remove leftover empty variable dereferenceRolf Eike Beer2017-06-081-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This was missed in 9c0d1e7531edbebc7943d5b981353b17631ed632 when the for loop that used this as loop variable was removed.
* | | | | | Merge topic 'FindDoxygen-imported-target-once'Brad King2017-06-091-16/+24
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 522c92d7 FindDoxygen: Create imported targets at most once in a given scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !945
| * | | | | FindDoxygen: Create imported targets at most once in a given scopeBrad King2017-06-091-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) need to be guarded against duplicate creation on multiple inclusion.
* | | | | | Merge topic 'improve-msvc-feature-checks'Brad King2017-06-091-1/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f44d9bcc C++ feature checks: Improve exclusion of "0 Warning(s)" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !938
| * | | | | C++ feature checks: Improve exclusion of "0 Warning(s)"Brad King2017-06-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply matching "0 Warning" may match "10 Warning(s)". Instead remove the entire ` 0 Warning(s)` content from the MSBuild output before searching it for warnings. Issue: #16942
* | | | | | CMake Nightly Date StampKitware Robot2017-06-091-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'bootstrap-cleanup'Brad King2017-06-081-32/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c0d1e75 bootstrap: implement cmake_extract_standard_flags() without loop 567bac89 bootstrap: use "grep -q" instead of output redirection 380bd70c bootstrap: implement cmake_toupper() using tr e61979a7 bootstrap: don't use 'cat x | sed', let sed open the file instead Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !937
| * | | | | bootstrap: implement cmake_extract_standard_flags() without loopRolf Eike Beer2017-06-071-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Pass all files to sed at once, and don't even change the directory for this.
| * | | | | bootstrap: use "grep -q" instead of output redirectionRolf Eike Beer2017-06-071-10/+10
| | | | | |
| * | | | | bootstrap: implement cmake_toupper() using trRolf Eike Beer2017-06-071-1/+1
| | | | | |
| * | | | | bootstrap: don't use 'cat x | sed', let sed open the file insteadRolf Eike Beer2017-06-071-18/+15
| | | | | |
* | | | | | Merge topic 'suppress-false-positive-warning'Brad King2017-06-081-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 488ffbef CTestCustom: Suppress warning matched on source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !934
| * | | | | CTestCustom: Suppress warning matched on source file nameBrad King2017-06-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `WarningMessagesDialog.cxx` source file name is displayed by MSVC in the compiler output, and the CTest launcher matches the name as a warning line starting in "Warning". Suppress this false positive with a custom exception.
* | | | | | CMake Nightly Date StampKitware Robot2017-06-081-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-070-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | CMake 3.9.0-rc2v3.9.0-rc2Brad King2017-06-071-1/+1
| | | | |
* | | | | Merge branch 'release-3.9'Brad King2017-06-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'FindDoxygen-compat' into release-3.9Brad King2017-06-071-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'revert-FindGTest-main-debug' into release-3.9Brad King2017-06-071-2/+2
| |\ \ \ \
* | \ \ \ \ Merge topic 'FindDoxygen-compat'Brad King2017-06-071-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 893ee1b1 FindDoxygen: Restore DOXYGEN_DOT_FOUND variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !935
| * | | | | FindDoxygen: Restore DOXYGEN_DOT_FOUND variableKonstantin Podsvirov2017-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) accidentally dropped this variable from its compatibility mode.
* | | | | | Merge topic 'revert-FindGTest-main-debug'Brad King2017-06-071-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ab2954c4 Revert "FindGTest: Add gtestd_main variant of debug library" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !936
| * | | | | Revert "FindGTest: Add gtestd_main variant of debug library"Brad King2017-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reported variant turned out to be due to a local configuration problem. Issue: #16940
* | | | | | Merge branch 'release-3.9'Brad King2017-06-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'doc-3.9-find_dependency' into release-3.9Brad King2017-06-071-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'autogen-no-vs-per-config' into release-3.9Brad King2017-06-074-19/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindGTest-main-debug' into release-3.9Brad King2017-06-061-2/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-vs2017-featuredetect' into release-3.9Brad King2017-06-061-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge topic 'doc-3.9-find_dependency'Brad King2017-06-071-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 137938e5 Help: Add 3.9 release note about find_dependency update Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !933
| * | | | | | | Help: Add 3.9 release note about find_dependency updateMatthew Woehlke2017-06-071-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'autogen-no-vs-per-config'Brad King2017-06-074-19/+4
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | cc1b513d Autogen: Do not use per-config file suffixes with VS yet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !932
| * | | | | Autogen: Do not use per-config file suffixes with VS yetBrad King2017-06-074-19/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~42^2~1 (Autogen: Per-config file suffixes, 2017-05-15) broke Visual Studio builds because the generators do not yet fully support per-config sources. Disable the behavior on Visual Studio generators for now. Fixes: #16939
* | | | | Merge topic 'fix-vs2017-featuredetect'Brad King2017-06-071-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | f4ce3962 C++ feature checks: Do not match "0 Warning(s)" as a warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !930
| * | | | C++ feature checks: Do not match "0 Warning(s)" as a warningWalter Gray2017-06-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~6^2~1 (C++ feature checks: check output for '[Ww]arning', 2017-06-03) accidentally matches `0 Warning(s)` in the output and always thinks a warning exists, thus failing all checks in Visual Studio builds. Fixes: #16942
* | | | Merge topic 'FindGTest-main-debug'Brad King2017-06-071-2/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | df18cd1d FindGTest: Add gtestd_main variant of debug library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !931
| * | | FindGTest: Add gtestd_main variant of debug libraryBrad King2017-06-061-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Current distributions name the debug library variant as `gtestd_main` rather than `gtest_maind`. Fixes: #16940