summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-revert-install-code-script-genex' into ↵Brad King2018-10-1110-70/+9
|\ | | | | | | revert-install-code-script-genex
| * install: Revert CODE,SCRIPT support for generator expressionsBrad King2018-10-1110-70/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.13.0-rc1~441^2 (install: Teach CODE,SCRIPT modes to evaluate generator expressions, 2018-05-29). Unfortunately it has been found to break existing code in a real project, e.g. install(CODE [[ message("$<FOOBAR>") ]]) Address this regression by reverting support for the 3.13 release series. Support can be restored later with a policy for compatibility. Issue: #15785 Fixes: #18435
* | Merge topic 'remove-AddCompileDefinitions'Brad King2018-10-116-31/+9
|\ \ | | | | | | | | | | | | | | | | | | 8f076acdb0 cmLocalGenerator: Remove AddCompileDefinitions method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2470
| * | cmLocalGenerator: Remove AddCompileDefinitions methodBrad King2018-10-106-31/+9
| | | | | | | | | | | | | | | | | | | | | This method offers the same definitions as `GetTargetDefines` except that it excludes the "export" macro on shared libraries. Update call sites to use `GetTargetDefines` instead. Some of them were incorrectly excluding the export macro.
* | | Merge branch 'release-3.13'Brad King2018-10-110-0/+0
|\ \ \
| * \ \ Merge branch 'vs-cuda-pdb' into release-3.13Brad King2018-10-1015-21/+32
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2473
* | \ \ \ Merge topic 'vs-cuda-pdb'Brad King2018-10-1115-21/+32
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faf3d7d224 VS: Add workaround for CUDA compiler PDB location with space 592064e026 VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+ fb378fc4d7 Tests: Fix Cuda test project names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2473
| * | | | VS: Add workaround for CUDA compiler PDB location with spaceBrad King2018-10-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA Toolkit Visual Studio Integration for version 9.2 and above does honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to invoke `cl`. Unfortunately it does not quote paths with spaces correctly: -Xcompiler "... /Fd"C:\path\with space\foo.pdb" ..." Work around this by converting the PDB location to a relative path. Likely we could always do this, but for now make a minimal change just for CUDA support. Fixes: #18440
| * | | | VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+Brad King2018-10-101-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround added by commit v3.12.0-rc1~227^2 (VS: Add workaround for CUDA compiler PDB location, 2018-04-13) is not necessary on CUDA 9.2+ because the CUDA Toolkit Visual Studio Integration has fixed the original bug and forwards the `ProgramDataBaseFileName` to the host compiler itself. Make the workaround conditional on the CUDA version. Issue: #18440
| * | | | Tests: Fix Cuda test project namesBrad King2018-10-1014-14/+14
| | |_|/ | |/| | | | | | | | | | | | | | Make them match what `ADD_TEST_MACRO` gives to ctest as the project name to build so that the `.sln` file will be found.
* | | | Merge topic 'cmake_policy-get_warning'Brad King2018-10-118-144/+177
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d988f98e5 cmake_policy: Add undocumented GET_WARNING command f9f96598df Help: Convert FindOpenGL documentation to block comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2472
| * | | | cmake_policy: Add undocumented GET_WARNING commandKyle Edwards2018-10-108-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command is intended for modules that issue policy warnings so they can get the warning string from CMake in a uniform manner, rather than duplicating the string. Several modules been updated to include an example of the usage of this new command.
| * | | | Help: Convert FindOpenGL documentation to block commentKyle Edwards2018-10-101-119/+120
| | | | |
* | | | | Merge topic 'install-subdirectory-order'Brad King2018-10-11145-164/+497
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b56f2db87a Testing: Add test for CMP0082 fc8955e889 add_subdirectory: Run subdirectory install rules in correct order 514f0b572e Testing: Update hard-coded line numbers to [0-9]+ in some tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2434
| * | | | | Testing: Add test for CMP0082Kyle Edwards2018-10-1035-2/+119
| | | | | |
| * | | | | add_subdirectory: Run subdirectory install rules in correct orderKyle Edwards2018-10-1014-19/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, install rules created by add_subdirectory() would be executed after all of the top-level install rules, even if they were declared before the top-level rules. This change adds a new policy, CMP0082, which interleaves the add_subdirectory() install rules with the other install rules so they are run in the correct order.
| * | | | | Testing: Update hard-coded line numbers to [0-9]+ in some testsKyle Edwards2018-10-1096-143/+143
| |/ / / /
* | | | | Merge topic 'FindwxWidgets-optional'Brad King2018-10-111-9/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 045b0beae1 FindwxWidgets: implement detailed components status on Windows 0813581859 FindwxWidgets: honor OPTIONAL_COMPONENTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2447
| * | | | | FindwxWidgets: implement detailed components status on WindowsTomasz Słodkowicz2018-10-101-0/+10
| | | | | |
| * | | | | FindwxWidgets: honor OPTIONAL_COMPONENTSTomasz Słodkowicz2018-10-041-9/+27
| | | | | |
* | | | | | Merge topic 'ctest-done'Brad King2018-10-119-28/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e0158712 ctest_submit: Add support for a "Done" part f460bbd4c8 ctest_submit: Refactor file list to use a vector instead of a set Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Zack Galbreath <zack.galbreath@kitware.com> Merge-request: !2405
| * | | | | | ctest_submit: Add support for a "Done" partBetsy McPhail2018-10-108-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CTest to submit Done.xml. Submission of this file indicates to CDash that a build is complete and no more files will be uploaded. It contains the build id returned by CDash and the current time. This file is submitted last for a given build when using the `ctest_submit()` command. If submitting by PARTS, use `ctest_submit(PARTS Done)`.
| * | | | | | ctest_submit: Refactor file list to use a vector instead of a setBetsy McPhail2018-10-102-28/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | Remove duplicates in a way that preserves order.
* | | | | | CMake Nightly Date StampKitware Robot2018-10-111-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release-3.12'Brad King2018-10-100-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-FindMatlab-missing-install' into release-3.12Brad King2018-10-101-12/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2471
* | \ \ \ \ \ Merge topic 'backport-FindMatlab-missing-install'Brad King2018-10-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7772bd31f5 FindMatlab: Guard against nonexistent installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2471
| * | | | | | FindMatlab: Guard against nonexistent installationChuck Atkins2018-10-101-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic added by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime Compiler support, 2017-04-29) assumes that `VersionInfo.xml` exists in the installation. Fix it to tolerate a missing or empty file. This change was originally made by commit v3.13.0-rc1~173^2 (FindMatlab: Guard against nonexistent installation, 2018-08-27). Here we backport it to the 3.12.x series. Fixes: #18436
* | | | | | | Merge topic 'module-index-restructure'Craig Scott2018-10-103-42/+73
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc372f6eef Help: Document Use_wxWindows.cmake as deprecated 846e3d2ceb Help: Reorganise module index into sections c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2463
| * | | | | | Help: Document Use_wxWindows.cmake as deprecatedCraig Scott2018-10-092-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation already logged a message saying that the module was deprecated. This change adds that message to the module docs.
| * | | | | | Help: Reorganise module index into sectionsJoachim Wuttke (l)2018-10-091-37/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split up module list into separate sections for utility modules and find modules. * Improve wording to explain how the different module types are expected to be called/used. * Move deprecated modules to their own separate sections.
| * | | | | | Help: Add link to cmake-qt(7) to FindQt.cmake.Joachim Wuttke (l)2018-10-091-5/+5
| | | | | | |
* | | | | | | Merge branch 'release-3.13'Brad King2018-10-100-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-102-44/+118
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2469
* | \ \ \ \ \ \ Merge topic 'update-vim-syntax'Brad King2018-10-102-44/+118
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7330a89f56 Merge branch 'upstream-vim-cmake-syntax' 456d96f0d5 vim-cmake-syntax 2018-10-10 (ac1957fb) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2469
| * | | | | | | Merge branch 'upstream-vim-cmake-syntax'Patrick Boettcher2018-10-102-44/+118
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2018-10-10 (ac1957fb)
| | * | | | | | vim-cmake-syntax 2018-10-10 (ac1957fb)vim-cmake-syntax upstream2018-10-102-46/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit ac1957fbccd24abc91089517f9116272825f8340 (master). Upstream Shortlog ----------------- Pablo Hernandez-Cerdan (1): baf680ae Add syntax for new cmake variables Patrick Boettcher (5): 2c9d5fda handle bracket-comments and arguments correctly 37d3bcb0 add test for bracket-comments and arguments 99b4a3d9 promote package_config_file-st to .in-file and add test 3ed26c29 update to cmake version 3.13.20181010-ga3598 ac1957fb update README
* | | | | | | | Merge topic 'project-version'Brad King2018-10-101-59/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f43bd3b6c Help: move description of CMAKE_PROJECT_* variables e3e5445d83 Help: Describe options of command project in a definition list. 5b56795d57 Help: make the two signatures of command "project" orthogonal Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2450
| * | | | | | | | Help: move description of CMAKE_PROJECT_* variablesJoachim Wuttke (o)2018-10-091-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe these variables along with the other variables.
| * | | | | | | | Help: Describe options of command project in a definition list.Joachim Wuttke (l)2018-10-091-51/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add section headers; explain default setting of optional argument variables.
| * | | | | | | | Help: make the two signatures of command "project" orthogonalJoachim Wuttke (l)2018-10-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'if-synopsis'Brad King2018-10-101-41/+49
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba90611225 Help: Make synopsis of if command more compact; add section headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2451
| * | | | | | | | | Help: Make synopsis of if command more compact; add section headersJoachim Wuttke (l)2018-10-091-41/+49
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also replace 'expression' by 'condition' (as in the while command); relegate optional arguments of else() and endif() to the text; revise explanation of operator precedence in Condition Syntax section.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-10-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'readme-build-docs'Brad King2018-10-091-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af6f16f1e8 README: Explain how to build CMake with the docs ae80271ed3 README: Fix typo (rm space). Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2466
| * | | | | | | | | README: Explain how to build CMake with the docsJoachim Wuttke (o)2018-10-091-0/+7
| | | | | | | | | |
| * | | | | | | | | README: Fix typo (rm space).Joachim Wuttke (o)2018-10-091-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'release-3.13'Brad King2018-10-090-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | CMake 3.13.0-rc1v3.13.0-rc1Brad King2018-10-090-0/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.13'Brad King2018-10-090-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
generated by cgit v0.12 at 2025-09-13 00:32:33 (GMT)