Commit Graph
47352 Commits
Author SHA1 Message Date
Peter Wu 6114d85a7d RPATH: Add option for using $ORIGIN in build tree
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
2018-10-26 09:25:51 -04:00
Brad King ec4b6854c9 Merge topic 'update-kwsys'
533de8873a Merge branch 'upstream-KWSys' into update-kwsys
0bc20334bc KWSys 2018-10-25 (9e27254b)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2526
2018-10-26 09:23:42 -04:00
Brad King 165a4e487e Merge branch 'release-3.13' 2018-10-26 09:22:33 -04:00
Brad King 7033a77942 Merge topic 'FindMPI-pthread-cuda'
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
2018-10-26 09:21:46 -04:00
Joachim Wuttke (o) 1610543863 Use_wxWindows: Correct version of deprecation
The deprecation note was added only recently, but the code
emitted a deprecation message since 2.8.9 or 2.8.10, from
what one can tell from the git history. This is now
documented as ".. deprecated:: 2.8.10".
2018-10-26 09:18:52 -04:00
Vitaly Stakhovsky b2c85cb698 cmLocalGenerator::AppendDefines: Remove const char* overloads
Accept const std::string& arguments only
2018-10-26 06:54:32 -04:00
Kitware Robot e07f147377 CMake Nightly Date Stamp 2018-10-26 00:01:08 -04:00
Joachim Wuttke (o) 760c87c73c Help: Back-reference from find_package() to "Find Modules"
viz., to section "Find Modules" in cmake-modules.7
2018-10-25 21:44:02 +02:00
Cristian Adam 786dddc0fd Add option to build CMake itself with IPO/LTO
Create a `CMake_BUILD_LTO` option when building with a CMake that
is new enough to support `CheckIPOSupported` everywhere.
2018-10-25 11:52:43 -04:00
Brad King 53e65e8e0a curl: Do not call cmake_minimum_required inside CMake itself
Re-use the requirements from the top-level.
2018-10-25 11:49:59 -04:00
Brad King 33cb7a669d Merge topic 'more-highlighting'
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
2018-10-25 11:01:33 -04:00
Brad King bb43a42bb9 Merge topic 'deprecation'
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
2018-10-25 11:00:57 -04:00
Brad King 68b8fc4a8c Merge topic 'project-commands'
adbaadf0ee Help: Apply syntax highlighting to project commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2525
2018-10-25 11:00:16 -04:00
Brad King e1dc842cc1 Merge branch 'FindMPI-pthread-cuda' into release-3.13
Merge-request: !2529
2018-10-25 10:48:14 -04:00
Brad King e2d54e5c40 FindMPI: Pass -pthread to CUDA compiler through -Xcompiler
When adding this flag to imported targets, wrap it in a generator
expression to use `-Xcompiler` to pass the flag for CUDA.

Fixes: #17929
2018-10-25 10:41:19 -04:00
Joachim Wuttke (o) 24fa04018c Help: Spell out ";-list" as "semicolon-separated list" 2018-10-25 15:44:59 +02:00
Brad King 57cb90ae71 Merge branch 'release-3.13' 2018-10-25 09:44:54 -04:00
Joachim Wuttke (o) 14edbe7e7b Help: Syntax highlighting for long strings in cmake-language.7 2018-10-25 14:00:34 +02:00
Joachim Wuttke (o) 4f4d5a9b3a Help: Apply syntax highlighting to cmake-generator-expressions.7 2018-10-25 13:55:30 +02:00
KWSys Upstream 0bc20334bc KWSys 2018-10-25 (9e27254b)
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
2018-10-25 07:53:11 -04:00
Brad King 533de8873a Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-10-25 (9e27254b)
2018-10-25 07:53:11 -04:00
Brad King 44cc305ac1 CMake 3.13.0-rc2 v3.13.0-rc2 2018-10-25 07:52:24 -04:00
Joachim Wuttke (o) adbaadf0ee Help: Apply syntax highlighting to project commands
* Replace most "::" by ".. code-block:: cmake"
  * Header sentence in imperative voice,
    detailed command description in present tense.
2018-10-25 13:47:31 +02:00
Brad King bba42bb91e Merge branch 'release-3.13' 2018-10-25 07:47:29 -04:00
Brad King 2459b5e832 Merge topic 'FindBoost-1.69'
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
2018-10-25 07:42:35 -04:00
Brad King ef91680a05 Merge branch 'FindBoost-1.69' into release-3.13
Merge-request: !2522
2018-10-25 07:41:36 -04:00
Mateusz Łoskot 364fb69adc FindBoost: Add support for upcoming Boost 1.69
This makes the module usable with Boost from its current master.
2018-10-25 07:39:48 -04:00
Brad King 82db7cbed8 Merge branch 'cmake-gui-vs-open-space' into release-3.13
Merge-request: !2524
2018-10-25 07:34:57 -04:00
Brad King 8cabaaf054 Merge topic 'cmake-gui-vs-open-space'
e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2524
2018-10-25 07:34:35 -04:00
Brad King e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path
Do not encode the path for a shell until after we check that it exists.

Fixes: #18501
2018-10-25 07:32:26 -04:00
Brad King f56fdf5736 Merge branch 'release-3.13' 2018-10-25 07:28:41 -04:00
Brad King 45c2406ba8 Merge branch 'release-3.12' 2018-10-25 07:27:07 -04:00
Brad King 69275d3b6a Merge topic 'cuda-thread-flags'
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
2018-10-25 07:26:24 -04:00
Brad King 1c31eae659 Merge topic 'tar-warnings'
95c8a03f00 cmake: Distinguish '-E tar' warnings from errors copying data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2519
2018-10-25 07:25:45 -04:00
Brad King 89ab893469 Merge topic 'fix-no-testing'
a834bcaa91 Tests: Add missing BUILD_TESTING conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dan Ibanez <daibane@sandia.gov>
Merge-request: !2520
2018-10-25 07:25:13 -04:00
Joachim Wuttke (o) c8e8c9cc7c Help: Date deprecation of deprecated commands. 2018-10-25 13:15:34 +02:00
Joachim Wuttke (o) 19998d7b3c Help: Use 'deprecated' template, and date deprecation of modules 2018-10-25 12:23:33 +02:00
Joachim Wuttke (o) dc1bb33578 Help: Add version number to deprecation note
In section "Deprecated Commands" in manual/cmake-commands.7,
indicate that those commands are deprecated since 3.0.
2018-10-25 11:05:06 +02:00
Kitware Robot 60264705b9 CMake Nightly Date Stamp 2018-10-25 00:01:08 -04:00
Brad King 9f7b609690 Merge branch 'fix-no-testing' into release-3.13
Merge-request: !2520
2018-10-24 15:52:03 -04:00
Brad King a834bcaa91 Tests: Add missing BUILD_TESTING conditions
We should not call `add_test` unless `BUILD_TESTING` is enabled.

Fixes: #18500
2018-10-24 15:51:17 -04:00
Brad King d81c4db489 Merge branch 'cuda-thread-flags' into release-3.13
Merge-request: !2512
2018-10-24 10:52:46 -04:00
Brad King 5d481919d4 Merge branch 'tar-warnings' into release-3.13
Merge-request: !2519
2018-10-24 10:52:37 -04:00
Brad King cf863b2e4e Merge branch 'tar-warnings' into release-3.12
Merge-request: !2519
2018-10-24 10:52:08 -04:00
Brad King 95c8a03f00 cmake: Distinguish '-E tar' warnings from errors copying data
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
2018-10-24 10:51:11 -04:00
Brad King da1580b48e Merge branch 'release-3.13' 2018-10-24 10:42:38 -04:00
Brad King 26494d279f Merge topic 'vs-csharp-win32-flags'
8e56e8b283 VS: Fix CSharp support for win32res: and win32icon: flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2516
2018-10-24 10:41:31 -04:00
Brad King 3793bed9df Merge topic 'vs-csharp-in-custom-target'
d004d8c59a VS: Fix crash on CSharp sources in a custom target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2515
2018-10-24 10:40:24 -04:00
Brad King 008cb6aa99 Merge topic 'scripting-commands'
c2efb3efcd Help: Revise docs on Scripting Commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2504
2018-10-24 10:39:39 -04:00
Brad King d17755f9cf Merge branch 'cuda-filter-device-link-items' into release-3.12
Merge-request: !2512
2018-10-24 10:23:55 -04:00