summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ExternalData: Tolerate files duplicated across multiple targetsBrad King2016-09-074-29/+74
| | | | | | | | | | | | | | | | | | | | | | If multiple ExternalData_Target_Add calls generate the same output file then we need to avoid calling add_custom_command multiple times with that output. This was already done within a single target by setting a variable in the local function scope. This will not be visible in other calls though so we need to use a directory property instead to prevent adding a custom command multiple times for one output in a directory. Normally it is not safe to have multiple custom commands that produce the same output file across multiple independent targets, but since we use atomic replacement of outputs the resulting races should not be a problem. For the convenience of projects, tolerate this instead of diagnosing it. In particular, we previously allowed up to two copies of the custom command in one directory because CMake has a fallback from MAIN_DEPENDENCY to an `<output>.rule` file. While at it, add a note to the documentation that typically only one external data target should be needed for a project. Reported-by: David Manthey <david.manthey@kitware.com>
* Merge branch 'release'Brad King2016-09-070-0/+0
|\
| * CMake 3.6.2v3.6.2Brad King2016-09-071-1/+1
| |
* | Merge branch 'release'Brad King2016-09-070-0/+0
|\ \ | |/
| * Merge branch 'backport-curl-fix' into releaseBrad King2016-09-071-1/+7
| |\
* | \ Merge topic 'backport-curl-fix'Brad King2016-09-071-1/+7
|\ \ \ | | |/ | |/| | | | | | | 4b53a693 curl: Backport certificate reuse fix from 7.50.2
| * | curl: Backport certificate reuse fix from 7.50.2Brad King2016-09-071-1/+7
| |/ | | | | | | | | Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously loaded certificate from file, 2016-08-22).
* | Merge topic 'GNUInstallDirs-function'Brad King2016-09-072-30/+56
|\ \ | | | | | | | | | | | | 17a24dc3 GNUInstallDirs: Add macro to expose internal logic publicly
| * | GNUInstallDirs: Add macro to expose internal logic publiclyRoger Leigh2016-09-072-30/+56
| | |
* | | Merge topic 'cpack-deb-package-description-fallback'Brad King2016-09-076-28/+47
|\ \ \ | | | | | | | | | | | | | | | | 332b089a CPack/DEB: Make package description variable precedence match RPM
| * | | CPack/DEB: Make package description variable precedence match RPMDomen Vrankar2016-09-076-28/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Make `CPACK_DEBIAN_PACKAGE_DESCRIPTION` fallback variable precedence match CPackRPM behavior as much as possible. This is technically a breaking change, but the new behavior is more consistent with expectation anyway. Closes: #16272
* | | Merge topic 'fix-continue-after-error'Brad King2016-09-079-16/+62
|\ \ \ | | | | | | | | | | | | | | | | f1ad71d7 cmMakefile: Restore nested error logic use of cmExecutionStatus
| * | | cmMakefile: Restore nested error logic use of cmExecutionStatusBrad King2016-09-069-16/+62
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 14a8d61f (cmMakefile: Port nested error logic away from cmExecutionStatus) we fail to continue processing function and macro bodies after non-fatal errors. A non-fatal error should not stop foreach loops, macro bodies, nested bodies, or the outer script. Add a test covering these cases, and revert the change to fix them. Also revert commit 2af853de (cmMakefile: Simplify IssueMessage implementation) because the assertion it added (which was removed by the above commit and is restored by reverting it) is incorrect. We do have code paths that call cmMakefile::IssueMessage with an empty execution stack, such as in CheckForUnusedVariables's LogUnused call.
* | | Merge topic 'include-what-you-use'Brad King2016-09-0738-82/+230
|\ \ \ | | | | | | | | | | | | | | | | d47c7bf6 CPack: include what you use
| * | | CPack: include what you useDaniel Pfeifer2016-09-0638-82/+230
| |/ /
* | | Merge topic 'wix-fix-static-prefix'Brad King2016-09-0710-38/+79
|\ \ \ | | | | | | | | | | | | | | | | 1bc33257 CPackWIX: Fix incomplete CPACK_WIX_SKIP_PROGRAM_FOLDER implementation
| * | | CPackWIX: Fix incomplete CPACK_WIX_SKIP_PROGRAM_FOLDER implementationMichael Stürmer2016-09-0610-38/+79
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 17bbf6af (CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature) generates GUIDs for most but not all components when the feature is active. Generate the remaining GUIDs as well. Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
* | | Merge topic 'vs-minor-cleanups'Brad King2016-09-078-25/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | 042aca55 VS: Verify that MSBuild.exe and devenv.com exist before using them a756c74d Help: Clarify meaning of MSVC<NN> variables
| * | | VS: Verify that MSBuild.exe and devenv.com exist before using themBrad King2016-09-062-7/+20
| | | |
| * | | Help: Clarify meaning of MSVC<NN> variablesBrad King2016-09-066-18/+12
| |/ / | | | | | | | | | They correspond to toolsets, not VS IDE versions.
* | | Merge topic 'FindMatlab-fix-empty-list-index'Brad King2016-09-071-2/+6
|\ \ \ | | | | | | | | | | | | | | | | 29768b03 FindMatlab: Avoid indexing an empty list of versions
| * | | FindMatlab: Avoid indexing an empty list of versionsBrad King2016-09-061-2/+6
| | | |
* | | | Merge branch 'release'Brad King2016-09-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'FindHDF5-fix-hl-fortran' into releaseBrad King2016-09-021-1/+1
| |\ \ \
| * \ \ \ Merge branch 'FindHDF5-is-parallel' into releaseBrad King2016-09-021-8/+60
| |\ \ \ \
* | | | | | CMake Nightly Date StampKitware Robot2016-09-071-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'genex-LINK_ONLY-not-linking'Brad King2016-09-065-3/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f6fd0abc Genex: Diagnose invalid LINK_ONLY usage instead of crashing
| * | | | | Genex: Diagnose invalid LINK_ONLY usage instead of crashingBrad King2016-09-055-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `$<LINK_ONLY:...>` is used outside of linking we may evaluate it without a `dagChecker`. Do not dereference the NULL pointer and issue a diagnostic instead. Closes: #16287
* | | | | | Merge topic 'test-GenerateExportHeader-with-RunCMake'Brad King2016-09-0644-51/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72ecdd34 Tests: Cleanup RunCMake.GenerateExportHeader somewhat fc3dab0e Tests: Port GenerateExportHeader test to RunCMake infrastructure 4feba34d GNU: Do not use -fvisibility on AIX or HP-UX
| * | | | | | Tests: Cleanup RunCMake.GenerateExportHeader somewhatBrad King2016-09-0511-51/+14
| | | | | | |
| * | | | | | Tests: Port GenerateExportHeader test to RunCMake infrastructureBrad King2016-09-0541-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow build failure cases to be added later.
| * | | | | | GNU: Do not use -fvisibility on AIX or HP-UXBrad King2016-09-054-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of `-fvisibility=hidden` warns: warning: visibility attribute not supported in this configuration; ignored
* | | | | | | Merge topic 'cpack-deb-long-filenames'Brad King2016-09-0610-3/+107
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ffdd564 CPack/DEB: Add option to select archive type
| * | | | | | | CPack/DEB: Add option to select archive typeDomen Vrankar2016-09-0510-3/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CPACK_DEBIAN_ARCHIVE_TYPE` option that can be used to select an archive type that supports long file names. Closes: #14332
* | | | | | | | Merge topic 'macro-parenthesis'Brad King2016-09-069-18/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a9de803 surround macro arguments with parentheses
| * | | | | | | | surround macro arguments with parenthesesDaniel Pfeifer2016-09-059-18/+19
| | | | | | | | |
* | | | | | | | | Merge topic 'cm_nullptr'Brad King2016-09-064-10/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0039ffa2 use CM_NULLPTR
| * | | | | | | | | use CM_NULLPTRDaniel Pfeifer2016-09-054-10/+12
| |/ / / / / / / /
* | | | | | | | | Merge topic 'qtdialog-tidy'Brad King2016-09-069-33/+51
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 62c5f9af QtDialog: fix clang-tidy warnings
| * | | | | | | | QtDialog: fix clang-tidy warningsDaniel Pfeifer2016-09-069-33/+51
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2016-09-061-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'include-what-you-use'Brad King2016-09-0526-36/+116
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32f756c8 CursesDialog: include what you use
| * | | | | | | | CursesDialog: include what you useDaniel Pfeifer2016-09-0326-36/+116
| |/ / / / / / /
* | | | | | | | Merge topic 'tidy-readability-redundant-string-cstr'Brad King2016-09-059-67/+60
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | 60dcaaea tidy: Fix readability-redundant-string-cstr issues
| * | | | | | | tidy: Fix readability-redundant-string-cstr issuesGregor Jasny2016-09-049-67/+60
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-09-051-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2016-09-041-1/+1
|/ / / / /
* | | | | Merge topic 'include-what-you-use'Brad King2016-09-03204-415/+1222
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efed6468 fix a load of include-what-you-use violations bd3d0eaf cmCTest: don't redefine cout and cerr 3838a0d5 make sure to include cmConfigure.h before cmStandardIncludes.h 54140848 Tests/CMakeLib: include what you use 3f9c4cdf Tests/CMakeLib: use cmsys::ifstream
| * | | | | fix a load of include-what-you-use violationsDaniel Pfeifer2016-09-03165-438/+1102
| | | | | |
| * | | | | cmCTest: don't redefine cout and cerrDaniel Pfeifer2016-09-031-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions have been introduced to ensure that cout and cerr are not used in certain files. However, this limitation does not apply to all source files that require cmCTest.h to be included. Furthermore, the definitions cause side effects depending on the include order. In total, the definitions do more harm than good. Remove them.
generated by cgit v0.12 at 2025-09-11 12:29:30 (GMT)