summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'minusCparse'Brad King2018-10-2913-1/+37
|\ | | | | | | | | | | | | | | 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
| * Tests: Add cases for -{C,D,U} without a source treeBrad King2018-10-2612-1/+22
| |
| * cmake: distinguish '-Cpath' from '-C path' in source dir parsingPaul Seyfert2018-10-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge topic 'appdef-stdstring'Brad King2018-10-294-17/+8
|\ \ | | | | | | | | | | | | | | | | | | b2c85cb698 cmLocalGenerator::AppendDefines: Remove const char* overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2533
| * | cmLocalGenerator::AppendDefines: Remove const char* overloadsVitaly Stakhovsky2018-10-264-17/+8
| | | | | | | | | | | | Accept const std::string& arguments only
* | | Merge topic 'EnableIPOBuild'Brad King2018-10-292-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add option to build CMake itself with IPO/LTOCristian Adam2018-10-251-0/+12
| | | | | | | | | | | | | | | | | | | | Create a `CMake_BUILD_LTO` option when building with a CMake that is new enough to support `CheckIPOSupported` everywhere.
| * | | curl: Do not call cmake_minimum_required inside CMake itselfBrad King2018-10-251-1/+0
| | | | | | | | | | | | | | | | Re-use the requirements from the top-level.
* | | | CMake Nightly Date StampKitware Robot2018-10-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-271-1/+1
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-260-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'doc-updates' into release-3.13Brad King2018-10-264-7/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2530
* | \ \ \ \ Merge topic 'doc-updates'Brad King2018-10-264-7/+19
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f9c253961 Help: clarify "LINKER:" prefix usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2530
| * | | | | Help: clarify "LINKER:" prefix usageMarc Chevrier2018-10-264-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18503
* | | | | | Merge topic 'deprecation2'Brad King2018-10-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1610543863 Use_wxWindows: Correct version of deprecation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2532
| * | | | | | Use_wxWindows: Correct version of deprecationJoachim Wuttke (o)2018-10-261-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
* | | | | | Merge topic 'xref1'Brad King2018-10-261-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 760c87c73c Help: Back-reference from find_package() to "Find Modules" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2531
| * | | | | | Help: Back-reference from find_package() to "Find Modules"Joachim Wuttke (o)2018-10-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | viz., to section "Find Modules" in cmake-modules.7
* | | | | | | 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |