summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | | | | | | | Merge topic 'vs-csharp-win32-flags'Brad King2018-10-245-10/+10
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e56e8b283 VS: Fix CSharp support for win32res: and win32icon: flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2516
| * | | | | | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing `:` to these entries in the flag table. The user value is always required and must come after the `:`. Fixes: #18486
* | | | | | | Merge topic 'vs-csharp-in-custom-target'Brad King2018-10-244-0/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d004d8c59a VS: Fix crash on CSharp sources in a custom target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2515
| * | | | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-234-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target generator does not compute ClOptions for custom targets, so we should not use them either. Fixes: #18377, #18485
* | | | | | Merge topic 'scripting-commands'Brad King2018-10-2441-319/+472
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2efb3efcd Help: Revise docs on Scripting Commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2504
| * | | | | | Help: Revise docs on Scripting CommandsJoachim Wuttke (l)2018-10-2341-319/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise docs for all "Scripting Commands", except four find_XXX that use a macro suite of their own. * Take full advantage of the improved syntax highlighting. * Make consequential use of <..> placeholders. * Clarify things here and there in the text. Specific improvements to some command docs: * "math": Correct description of novel hexadecimal capability. * "if", "foreach", "while": Provide link to "endif" etc * "foreach", "while": Mention "break" and "continue". * "foreach": Simplify explanation of ``RANGE`` and ``IN`` signatures; advise against negative arguments or reverse ranges (compare issue #18461) * "endif", "endfunction" etc: Explain that the argument is optional and maintained for compatibility only
* | | | | | | CMake Nightly Date StampKitware Robot2018-10-241-1/+1
| | | | | | |
* | | | | | | Merge topic 'rst-block-comments'Brad King2018-10-23202-9868/+10078
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75f73dde0f Utilities/Scripts: Remove temporary block-style comment conversion script df4ed1e9ff Help: Convert remaining modules to block-style comments 7115aa6c22 Utilities/Scripts: Add temporary block-style comment conversion script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2510
| * | | | | | | Utilities/Scripts: Remove temporary block-style comment conversion scriptKyle Edwards2018-10-221-33/+0
| | | | | | | |
| * | | | | | | Help: Convert remaining modules to block-style commentsKitware Robot2018-10-22202-9868/+10078
| | | | | | | |
| * | | | | | | Utilities/Scripts: Add temporary block-style comment conversion scriptKyle Edwards2018-10-221-0/+33
| | | | | | | |
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-230-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-222-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | Merge-request: !2511
| * | | | | | | Merge branch 'update-curl' into release-3.13Brad King2018-10-22114-1859/+2568
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2509
| * \ \ \ \ \ \ \ Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2513
* | \ \ \ \ \ \ \ \ Merge topic 'GNUInstallDirs-kfreebsd-man'Brad King2018-10-232-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2d7ab8bd1 GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2511
| * | | | | | | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-222-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'update-curl'Brad King2018-10-23114-1859/+2568
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0310024563 curl: Update build within CMake to account for 7.61 changes b9d1107790 curl: Backport to work with CMake 3.1 again e9e8dcee6b Merge branch 'upstream-curl' into update-curl 18812a9c3d curl 2018-09-04 (432eb5f5) ded211ae46 curl: Update script to get curl 7.61.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2509
| * | | | | | | | curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS. Drop our own CURL_STATICLIB compile definition because it is now provided by curl's usage requirements.
| * | | | | | | | curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curl 7.61.1 requires CMake 3.4 to build from source and also exposes a dependency on OpenSSL imported targets. Revert that part of the changes imported from curl upstream.
generated by cgit v0.12 at 2025-01-22 16:48:02 (GMT)