summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'relative-rpath'Brad King2018-10-2618-4/+172
|\ | | | | | | | | | | | | | | | | 95bd6317bc RPATH: Record support for $ORIGIN on various *BSD c9b8c79271 RPATH: Record support for $ORIGIN on Haiku and Solaris 6114d85a7d RPATH: Add option for using $ORIGIN in build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2456
| * RPATH: Record support for $ORIGIN on various *BSDPeter Wu2018-10-264-0/+11
| | | | | | | | | | | | | | | | | | | | All of NetBSD, FreeBSD, OpenBSD and DragonFly BSD support `$ORIGIN`, but the last two require `-z origin` as documented at https://lekensteyn.nl/rpath.html The `-z origin` option causes a flag bit to be set and has no effect if the `RPATH` does not contain expandable tokens.
| * RPATH: Record support for $ORIGIN on Haiku and SolarisPeter Wu2018-10-262-0/+2
| | | | | | | | | | Solaris 7 and Haiku (since 2013) both support $ORIGIN as documented at https://lekensteyn.nl/rpath.html
| * RPATH: Add option for using $ORIGIN in build treePeter Wu2018-10-2612-4/+159
| | | | | | | | | | | | | | | | | | This makes binaries independent of the build directory by not embedding the build directory via RPATH. The tests are partially based on the existing RuntimePath test, but with the check moved into a POST_BUILD command such that it can be skipped when the platform lacks support. Fixes: #18413
* | Merge topic 'update-kwsys'Brad King2018-10-261-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 533de8873a Merge branch 'upstream-KWSys' into update-kwsys 0bc20334bc KWSys 2018-10-25 (9e27254b) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2526
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-251-0/+1
| |\ \ | | |/ | |/| | | | | | | * upstream-KWSys: KWSys 2018-10-25 (9e27254b)
| | * KWSys 2018-10-25 (9e27254b)KWSys Upstream2018-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9e27254b743c1511113172c9c9a1b42166225b29 (master). Upstream Shortlog ----------------- Cristian Adam (1): 993be8b6 Set CMake Policy CMP0069 to NEW within KWSys
* | | Merge branch 'release-3.13'Brad King2018-10-260-0/+0
|\ \ \
| * \ \ Merge branch 'FindMPI-pthread-cuda' into release-3.13Brad King2018-10-251-1/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2529
* | \ \ \ Merge topic 'FindMPI-pthread-cuda'Brad King2018-10-261-1/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e2d54e5c40 FindMPI: Pass -pthread to CUDA compiler through -Xcompiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2529
| * | | | FindMPI: Pass -pthread to CUDA compiler through -XcompilerBrad King2018-10-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding this flag to imported targets, wrap it in a generator expression to use `-Xcompiler` to pass the flag for CUDA. Fixes: #17929
* | | | | CMake Nightly Date StampKitware Robot2018-10-261-1/+1
| | | | |
* | | | | Merge topic 'more-highlighting'Brad King2018-10-252-19/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14edbe7e7b Help: Syntax highlighting for long strings in cmake-language.7 4f4d5a9b3a Help: Apply syntax highlighting to cmake-generator-expressions.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2527
| * | | | | Help: Syntax highlighting for long strings in cmake-language.7Joachim Wuttke (o)2018-10-251-13/+17
| | | | | |
| * | | | | Help: Apply syntax highlighting to cmake-generator-expressions.7Joachim Wuttke (o)2018-10-251-6/+18
| | | | | |
* | | | | | Merge topic 'deprecation'Brad King2018-10-2527-48/+77
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8e8c9cc7c Help: Date deprecation of deprecated commands. 19998d7b3c Help: Use 'deprecated' template, and date deprecation of modules dc1bb33578 Help: Add version number to deprecation note Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2523
| * | | | | Help: Date deprecation of deprecated commands.Joachim Wuttke (o)2018-10-2516-16/+32
| | | | | |
| * | | | | Help: Use 'deprecated' template, and date deprecation of modulesJoachim Wuttke (o)2018-10-2510-30/+42
| | | | | |
| * | | | | Help: Add version number to deprecation noteJoachim Wuttke (o)2018-10-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In section "Deprecated Commands" in manual/cmake-commands.7, indicate that those commands are deprecated since 3.0.
* | | | | | Merge topic 'project-commands'Brad King2018-10-2545-103/+108
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adbaadf0ee Help: Apply syntax highlighting to project commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2525
| * | | | | | Help: Apply syntax highlighting to project commandsJoachim Wuttke (o)2018-10-2545-103/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace most "::" by ".. code-block:: cmake" * Header sentence in imperative voice, detailed command description in present tense.
* | | | | | | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-10-251-14/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2522
| * \ \ \ \ Merge branch 'cmake-gui-vs-open-space' into release-3.13Brad King2018-10-251-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2524
* | \ \ \ \ \ Merge topic 'FindBoost-1.69'Brad King2018-10-251-14/+29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 364fb69adc FindBoost: Add support for upcoming Boost 1.69 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mateusz Łoskot <mateusz@loskot.net> Merge-request: !2522
| * | | | | | FindBoost: Add support for upcoming Boost 1.69Mateusz Łoskot2018-10-251-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the module usable with Boost from its current master.
* | | | | | | Merge topic 'cmake-gui-vs-open-space'Brad King2018-10-251-2/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2524
| * | | | | | cmake-gui: Fix "Open Project" for VS IDE with space in pathBrad King2018-10-251-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not encode the path for a shell until after we check that it exists. Fixes: #18501
* | | | | | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'fix-no-testing' into release-3.13Brad King2018-10-242-4/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Merge-request: !2520
| * | | | | Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-249-18/+94
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2512
| * \ \ \ \ \ Merge branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2519
* | \ \ \ \ \ \ Merge branch 'release-3.12'Brad King2018-10-250-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tar-warnings' into release-3.12Brad King2018-10-241-13/+31
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | Merge-request: !2519
| * | | | | | | | Merge branch 'cuda-filter-device-link-items' into release-3.12Brad King2018-10-241-1/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2512
* | \ \ \ \ \ \ \ \ Merge topic 'cuda-thread-flags'Brad King2018-10-259-18/+94
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc050b53b CUDA: Add test for device linking when host linking uses threads 83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler cf92fd9ae9 Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags e768d96c74 CUDA: Filter out host link flags during device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kelly (KT) Thompson <kgt@lanl.gov> Merge-request: !2512
| * | | | | | | | | CUDA: Add test for device linking when host linking uses threadsRobert Maynard2018-10-247-16/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the `CudaOnly.LinkSystemDeviceLibraries` test to a new `Cuda.ProperDeviceLibraries` test. The former covered only the `cublas_device` library which is removed by CUDA 10. Extend the new test to also cover various cases of using threads. Issue: #18008
| * | | | | | | | | FindThreads: Pass -pthread to CUDA compiler through -XcompilerRolf Eike Beer2018-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18008
| * | | | | | | | | Merge branch 'cuda-filter-device-link-items' into cuda-thread-flagsBrad King2018-10-241-1/+18
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | CUDA: Filter out host link flags during device linkingRobert Maynard2018-10-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device linking, 2018-03-27) we consider every link item during device linking. However, items that start in `-` may be host-specific link flags that nvcc will not understand during device linking. Filter such items using a white list. In particular, this allows `-pthread` to be used for host linking while not polluting the device link line. Issue: #18008
* | | | | | | | | | Merge topic 'tar-warnings'Brad King2018-10-251-13/+31
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95c8a03f00 cmake: Distinguish '-E tar' warnings from errors copying data Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2519
| * | | | | | | | | cmake: Distinguish '-E tar' warnings from errors copying dataBrad King2018-10-241-13/+31
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit v3.12.0-rc1~62^2 (cmake: Teach '-E tar' to report errors copying data, 2018-05-16) incorrectly reports failure in the case of ARCHIVE_WARN. Convert this case to a warning. Fixes: #18496
* | | | | | | | | Merge topic 'fix-no-testing'Brad King2018-10-252-4/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a834bcaa91 Tests: Add missing BUILD_TESTING conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Dan Ibanez <daibane@sandia.gov> Merge-request: !2520
| * | | | | | | Tests: Add missing BUILD_TESTING conditionsBrad King2018-10-242-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not call `add_test` unless `BUILD_TESTING` is enabled. Fixes: #18500
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-251-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-240-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2516
| * \ \ \ \ \ \ \ Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-234-0/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Merge-request: !2515
generated by cgit v0.12 at 2024-11-15 05:59:20 (GMT)