summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Factor target generation loop body into helper methodBrad King2018-07-192-224/+231
|
* Xcode: Compute global order index for targetsBrad King2018-07-192-0/+37
| | | | | Compute an index for each target in a global ordering such that no target comes before its dependencies.
* Xcode: Remove loop over local generators that has no effectBrad King2018-07-191-7/+0
| | | | | Remove a loop over local generators whose body was dropped long ago by commit v2.6.0~1677 (Remove unused build rules from Xcode, 2007-05-28).
* Merge topic 'cpack_archive_typo'Brad King2018-07-191-5/+5
|\ | | | | | | | | | | | | 22fbf39d9b CPack: Fix log typos (spaces in the wrong places) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2222
| * CPack: Fix log typos (spaces in the wrong places)Sylvain Joubert2018-07-181-5/+5
| |
* | Merge branch 'release-3.12'Brad King2018-07-190-0/+0
|\ \
| * \ Merge branch 'tcl-8.7' into release-3.12Brad King2018-07-183-0/+9
| |\ \ | | | | | | | | | | | | Merge-request: !2223
| * \ \ Merge branch 'UseSWIG-csharp-conditional' into release-3.12Brad King2018-07-181-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2219
| * \ \ \ Merge branch 'csharp-compiler-loaded' into release-3.12Brad King2018-07-181-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2220
* | \ \ \ \ Merge topic 'tcl-8.7'Brad King2018-07-193-0/+9
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bec3be11b9 FindTCL: Add support for version 8.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2223
| * | | | | FindTCL: Add support for version 8.7Dima Panov2018-07-183-0/+9
| |/ / / / | | | | | | | | | | | | | | | Fixes: #18186
* | | | | Merge topic 'UseSWIG-csharp-conditional'Brad King2018-07-191-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed289e0577 UseSWIG: Use CSharp language only if it is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ram-Z <me@rmz.io> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !2219
| * | | | UseSWIG: Use CSharp language only if it is enabledBrad King2018-07-181-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.12.0-rc1~2^2 (UseSWIG: Add CSHARP variant for wrapper files, 2018-06-08) we explicitly marked swig-generated `.cs` files as `LANGUAGE` CSharp so that the resulting sources can be compiled. However, this works only when the CSharp language has been enabled. Fixes: #18184
* | | | Merge topic 'csharp-compiler-loaded'Brad King2018-07-191-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2220
| * | | CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabledBrad King2018-07-181-0/+1
| |/ / | | | | | | | | | We already do this for C, CXX, Fortran, etc.
* | | CMake Nightly Date StampKitware Robot2018-07-191-1/+1
| | |
* | | Merge topic 'doc-regex-notes'Brad King2018-07-181-0/+14
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4b35dab891 Help: Document how escape sequences work in a regex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2221
| * | Help: Document how escape sequences work in a regexBrad King2018-07-181-0/+14
|/ / | | | | | | | | Our regex engine doesn't interpret `\`-escapes but CMake language escape sequences may be used to pass literal whitespace characters to it.
* | Merge topic 'remove-simpleinstall'Brad King2018-07-18102-1250/+250
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31e79050b2 Tests: Remove the SimpleInstall test 36ef57a939 Tests: Add test for cmake --build . --target package 11ca374b28 Tests: Add test for install(SCRIPT ... COMPONENT) 2201fb6f43 Tests: Add test for InstallRequiredSystemLibraries 5a7a006fdd Tests: Add test for $<0:...> in ExportImport 69ca768e78 Tests: Add test for install(TARGETS) RPATH functionality 25c3fb6c35 Tests: Add test for install(FILES) with PERMISSIONS b5df4faa20 Tests: Add test for installing parts of targets in different directories ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2209
| * | Tests: Remove the SimpleInstall testKyle Edwards2018-07-1757-1241/+0
| | | | | | | | | | | | | | | The cases that were covered by SimpleInstall have been moved into RunCMake.install.
| * | Tests: Add test for cmake --build . --target packageKyle Edwards2018-07-173-8/+25
| | |
| * | Tests: Add test for install(SCRIPT ... COMPONENT)Kyle Edwards2018-07-175-0/+9
| | |
| * | Tests: Add test for InstallRequiredSystemLibrariesKyle Edwards2018-07-173-0/+12
| | |
| * | Tests: Add test for $<0:...> in ExportImportKyle Edwards2018-07-171-3/+3
| | | | | | | | | | | | | | | This test case already includes test cases for $<1...> and $<0...>, but this commit adds a few $<0:...>'s in cases where it was missing.
| * | Tests: Add test for install(TARGETS) RPATH functionalityKyle Edwards2018-07-175-1/+42
| | |
| * | Tests: Add test for install(FILES) with PERMISSIONSKyle Edwards2018-07-173-0/+7
| | |
| * | Tests: Add test for installing parts of targets in different directoriesKyle Edwards2018-07-174-0/+15
| | |
| * | Tests: Add test for install(DIRECTORY) with PATTERN and REGEXKyle Edwards2018-07-176-0/+38
| | |
| * | Tests: Add test for CONFIGURATIONS parameter of install()Kyle Edwards2018-07-173-0/+4
| | |
| * | Tests: Add test for install(<SCRIPT|CODE>)Kyle Edwards2018-07-174-0/+11
| | |
| * | Tests: Add test for <PRE|POST>_INSTALL_SCRIPTKyle Edwards2018-07-175-0/+11
| | |
| * | Tests: Add test for deprecated install_*() commandsKyle Edwards2018-07-175-0/+19
| | |
| * | Tests: Add tests for *OUTPUT_NAME propertiesKyle Edwards2018-07-173-0/+44
| | |
| * | Tests: Add test for install(DIRECTORY ... OPTIONAL)Kyle Edwards2018-07-173-0/+3
| | |
| * | Tests: Add tests for install(<TARGETS|FILES> ... OPTIONAL)Kyle Edwards2018-07-176-0/+10
| | |
* | | Merge topic 'nvcc_dlink_dedup_static_libs'Brad King2018-07-187-5/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd0523a215 CUDA: Properly de-duplicate libs when doing device linking b07c71831c CUDA: Add a test to verify device linking can handle circular deps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2214
| * | | CUDA: Properly de-duplicate libs when doing device linkingRobert Maynard2018-07-172-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nvcc device linker is designed so that each static library with device symbols only needs to be listed once as it doesn't care about link order. If you provide the same static library multiple times it will error out. To make sure this occurs we find the unique set of link items.
| * | | CUDA: Add a test to verify device linking can handle circular depsRobert Maynard2018-07-176-0/+61
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-07-181-1/+1
| |/ / |/| |
* | | Merge branch 'release-3.12'Brad King2018-07-170-0/+0
|\ \ \ | | |/ | |/|
| * | CMake 3.12.0v3.12.0Brad King2018-07-171-1/+1
| | |
* | | Merge topic 'math-err'Brad King2018-07-1712-92/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 406f397e8b math: Restore toleration of unexpected characters in an expression dd5c54600b cmExprParserHelper: Simplify error state tracking 185bcface4 cmExprParserHelper: Remove some unused code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2218
| * | | math: Restore toleration of unexpected characters in an expressionBrad King2018-07-1612-76/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 7c4c13ffef (math: Reject unexpected expression input explicitly, 2018-05-18) we ignored unexpected characters in an expression that otherwise can be parsed. In order to preserve compatibility with projects that accidentally used this, convert the error to a warning.
| * | | cmExprParserHelper: Simplify error state trackingBrad King2018-07-161-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Errors always have explanation strings, so use the presence of such a string to track whether an error has occurred. This avoids an extra variable.
| * | | cmExprParserHelper: Remove some unused codeBrad King2018-07-162-10/+0
| | | |
* | | | Merge topic 'FindProtobuf-upstream-impl'Brad King2018-07-171-99/+143
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71d99e156b Protobuf: restore previous output directory 2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support 1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check 1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2212
| * | | | Protobuf: restore previous output directoryAndré Apitzsch2018-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The protobuf upstream implementation has a different default output directory. Restore our original output directory for compatibility.
| * | | | Protobuf: restore 'DESCRIPTORS' supportAndré Apitzsch2018-07-161-4/+23
| | | | | | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | | Protobuf: restore 'PROTOBUF_IMPORT_DIRS' checkAndré Apitzsch2018-07-161-0/+8
| | | | | | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | | Protobuf: use upstream implementation to generate cpp and python filesAndré Apitzsch2018-07-161-104/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate functions are taken from [1] and [2]. The license [3] is already covered by our BSD-3 license for CMake and our inclusion of "Google Inc" in `Copyright.txt`. [1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in [2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in [3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE