Commit Graph

41085 Commits

Author SHA1 Message Date
Brad King 4c669a0a34 Merge topic 'UseSWIG-typos'
2fc43415ef UseSWIG: Add target language and input file in command description
20fd16e756 UseSWIG: Typo, add missing letter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2542
2018-10-30 10:57:45 -04:00
Brad King 263afbad64 Merge topic 'UseSWIG-multi-input'
bb57cb80eb UseSWIG: multiple input files must be supported in version 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2539
2018-10-30 10:56:55 -04:00
Brad King b8f5eca5e2 Merge topic 'FindMatlab-2018a-API'
42731e94be FindMatlab: Fix linker command under Windows.
ee73e733e4 FindMatlab: Fix compilation error in one specific test configuration.
160499296c FindMatlab: added unit tests for new functionality.
ee7e97a7d3 FindMatlab: add change log item.
d7e19032d5 FindMatlab: `matlab_add_mex` has new options `R2017b` and `R2018a`.
518553d953 FindMatlab: Always find core libraries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2508
2018-10-30 10:55:52 -04:00
Kitware Robot 9330afea04 CMake Nightly Date Stamp 2018-10-30 00:01:08 -04:00
Sylvain Joubert 2fc43415ef UseSWIG: Add target language and input file in command description 2018-10-29 17:09:48 +01:00
Marc Chevrier bb57cb80eb UseSWIG: multiple input files must be supported in version 2
Fixes: #18506
2018-10-29 16:39:03 +01:00
Sylvain Joubert 20fd16e756 UseSWIG: Typo, add missing letter 2018-10-29 15:00:11 +01:00
Brad King d697f4eb48 Merge topic 'target_property-clarification'
213433858f Help: Clarify usage of TARGET_PROPERTY generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2535
2018-10-29 09:58:00 -04:00
Brad King d6b7c037b2 Merge topic 'ExternalProject-log-patch'
a4e9391953 ExternalProject: add LOG_PATCH option to log the patch command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2534
2018-10-29 09:57:17 -04:00
Brad King bcd61da350 Merge topic 'graphviz-fix-alias'
50c4dec072 graphviz: dereference ALIAS targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2521
2018-10-29 09:56:25 -04:00
Brad King f0a9094d80 Merge topic 'no-smiley'
24fa04018c Help: Spell out ";-list" as "semicolon-separated list"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2528
2018-10-29 09:30:25 -04:00
Brad King 4eb77958d2 Merge topic 'minusCparse'
379e5f93a9 Tests: Add cases for -{C,D,U} without a source tree
5873815fef cmake: distinguish '-Cpath' from '-C path' in source dir parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2517
2018-10-29 09:29:34 -04:00
Brad King 0f84db3af4 Merge topic 'appdef-stdstring'
b2c85cb698 cmLocalGenerator::AppendDefines: Remove const char* overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2533
2018-10-29 09:27:23 -04:00
Brad King 6ece73dccb Merge topic 'EnableIPOBuild'
786dddc0fd Add option to build CMake itself with IPO/LTO
53e65e8e0a curl: Do not call cmake_minimum_required inside CMake itself

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2505
2018-10-29 09:25:46 -04:00
Cris Luengo 42731e94be FindMatlab: Fix linker command under Windows. 2018-10-28 23:12:25 -06:00
Cris Luengo ee73e733e4 FindMatlab: Fix compilation error in one specific test configuration.
`matlab_wrapper2.cpp` failed to compile in one specific test configuration.
I've copied an odd workaround from `matlab_wrapper1.cpp`, which doesn't fail
to compile. I presume this workaround was meant to address this issue, but
can't verify this locally.
2018-10-28 23:12:26 -06:00
Kitware Robot 01c6f99c2d CMake Nightly Date Stamp 2018-10-29 00:01:16 -04:00
Kitware Robot 7523c1dcd9 CMake Nightly Date Stamp 2018-10-28 00:01:07 -04:00
Kitware Robot bae85447b8 CMake Nightly Date Stamp 2018-10-27 00:01:11 -04:00
Kyle Edwards 213433858f Help: Clarify usage of TARGET_PROPERTY generator expression
When using $<TARGET_PROPERTY:prop>, the value of prop comes from
the consuming target rather than the current target. Add a note to
clarify this.
2018-10-26 14:43:17 -04:00
Wouter Klouwen a4e9391953 ExternalProject: add LOG_PATCH option to log the patch command
Most steps support the logging into a file but the patch command is a
notable exception. This commit adds the LOG_PATCH options that acts as
the other LOG_* options.
2018-10-26 16:50:23 +01:00
Nick Schultz 50c4dec072 graphviz: dereference ALIAS targets
Previous behavior treats ALIAS targets as external targets.
This fix de-aliases these targets to their pointed target.

Fixes: #15636
2018-10-26 11:17:49 -04:00
Brad King 2a8c05ddc7 Merge branch 'release-3.13' 2018-10-26 11:03:03 -04:00
Brad King f7b8e67463 Merge topic 'doc-updates'
2f9c253961 Help: clarify "LINKER:" prefix usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2530
2018-10-26 11:02:09 -04:00
Brad King 379e5f93a9 Tests: Add cases for -{C,D,U} without a source tree 2018-10-26 10:56:46 -04:00
Paul Seyfert 5873815fef cmake: distinguish '-Cpath' from '-C path' in source dir parsing
This results in the correct source directory being picked up in calls
with

    cmake sourcedir -C settings

and in a more appropriate error message when calling

    mkdir build ; cd build ; cmake -C settings

Also fix `-D` and `-U` in the same way.
2018-10-26 09:50:00 -04:00
Brad King 8a539e7c2f Merge topic 'deprecation2'
1610543863 Use_wxWindows: Correct version of deprecation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2532
2018-10-26 09:40:56 -04:00
Brad King 216df68b32 Merge topic 'xref1'
760c87c73c Help: Back-reference from find_package() to "Find Modules"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2531
2018-10-26 09:40:09 -04:00
Brad King 97624af751 Merge branch 'doc-updates' into release-3.13
Merge-request: !2530
2018-10-26 09:37:41 -04:00
Marc Chevrier 2f9c253961 Help: clarify "LINKER:" prefix usage
Fixes: #18503
2018-10-26 09:36:53 -04:00
Brad King 6166384e3e Merge topic 'relative-rpath'
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
2018-10-26 09:31:00 -04:00
Peter Wu 95bd6317bc RPATH: Record support for $ORIGIN on various *BSD
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.
2018-10-26 09:27:29 -04:00
Peter Wu c9b8c79271 RPATH: Record support for $ORIGIN on Haiku and Solaris
Solaris 7 and Haiku (since 2013) both support $ORIGIN as documented at
https://lekensteyn.nl/rpath.html
2018-10-26 09:26:47 -04:00
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