Commit Graph

39719 Commits

Author SHA1 Message Date
Craig Scott
4e890800eb Merge topic 'doxygen-all'
7b2f440e2b FindDoxygen: Add tests for ALL option
79b29b732c FindDoxygen: add optional ALL argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2099
2018-05-29 05:25:04 -04:00
Kitware Robot
11818c5fc1 CMake Nightly Date Stamp 2018-05-29 00:01:04 -04:00
Kitware Robot
965c79cc90 CMake Nightly Date Stamp 2018-05-28 00:01:04 -04:00
Craig Scott
3cc081654d Merge topic 'cmake-D-option-help'
42738e5075 Help: Update description of the -D option to CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2105
2018-05-27 04:40:34 -04:00
Craig Scott
7b2f440e2b FindDoxygen: Add tests for ALL option 2018-05-27 18:18:40 +10:00
Kitware Robot
caab746548 CMake Nightly Date Stamp 2018-05-27 00:01:06 -04:00
Kitware Robot
64946fff30 CMake Nightly Date Stamp 2018-05-26 00:01:10 -04:00
Brad King
46b26b52c9 Merge topic 'FindPerl-strawberry'
b37d583d5c FindPerl: Add support for Strawberry Perl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2102
2018-05-25 09:29:12 -04:00
Brad King
266fd71654 Merge topic 'FindLua-conventional-paths'
f5d19260f9 FindLua: Search for lua.h using more conventional paths
9455512d22 FindLua: Add tests for this module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2095
2018-05-25 09:26:21 -04:00
Brad King
9b5161e24f Merge topic 'vs-scope'
45c4a75d27 cmVisualStudio10TargetGenerator: make sure each Elem has right scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2096
2018-05-25 09:25:17 -04:00
Brad King
cf723c493e Merge topic 'FindODBC-module'
357db10bd1 FindODBC: Add module to search for ODBC library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2069
2018-05-25 09:23:52 -04:00
Kitware Robot
a9bab1443e CMake Nightly Date Stamp 2018-05-25 00:01:04 -04:00
Raul Laasner
42738e5075 Help: Update description of the -D option to CMake
Fixes #18021
2018-05-24 17:50:33 -04:00
Alexander Grund
f5d19260f9 FindLua: Search for lua.h using more conventional paths
Do not constrain the search to `include/*`.  To provide compatibility
the foreach-loop is still used. However `include/xxx` and `xxx` is now
both searched.  This honors now e.g. CMAKE_INCLUDE_PATH.

Fixes: #17999
2018-05-24 11:20:09 -04:00
Alexander Grund
9455512d22 FindLua: Add tests for this module 2018-05-24 11:19:40 -04:00
Lauri
b37d583d5c FindPerl: Add support for Strawberry Perl
Fixes: #18027
2018-05-24 09:58:27 -04:00
Brad King
2f8230b052 Merge topic 'revise-case-insensitive-command'
b1a05d6c76 Revise implementation of case-insensitive command names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
2018-05-24 09:56:23 -04:00
Brad King
2eb9852d7b Merge topic 'FindBZip2-imported-include-dirs'
0887c993aa FindBZip2: Populate BZIP2_INCLUDE_DIRS result variable
a8bf1ea5b7 FindBZip2: Format result variable docs as definition list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2097
2018-05-24 09:55:46 -04:00
David Demelier
79b29b732c FindDoxygen: add optional ALL argument 2018-05-24 15:13:35 +02:00
Kitware Robot
2d480a1c14 CMake Nightly Date Stamp 2018-05-24 00:01:04 -04:00
Kitware Robot
0e6bc9d025 CMake Nightly Date Stamp 2018-05-23 00:01:05 -04:00
Mateusz Loskot
357db10bd1 FindODBC: Add module to search for ODBC library
Add tests for FindODBC module.
2018-05-22 21:29:22 +02:00
Vitaly Stakhovsky
45c4a75d27 cmVisualStudio10TargetGenerator: make sure each Elem has right scope
Prepare for future RAII
2018-05-22 11:28:11 -04:00
Florian Jacomme
b1a05d6c76 Revise implementation of case-insensitive command names
Store both the as-written and lower-case command names and use
the latter to avoid case-insensitive string comparisons.

With this I obtain 2-6% speed increase (on Windows) for the configure
step with no significant changes in memory usage.  A case-insensitive
comparison is a lot slower than just calling `==` because the operator
will use things like memcmp, so prefer the latter.

The `cmSystemTools::LowerCase` function allocates a new string each time
it is called, so before this change we were allocating in:

* cmMakefile::Configure two times for each function
  (to look for `cmake_minimum_required` and `project`)
* cmMakefile::ExecuteCommand twice by function by calling
  cmState::GetCommand and copying the name

Now we are only allocating once by function instead of four.
2018-05-22 10:56:24 -04:00
Brad King
0887c993aa FindBZip2: Populate BZIP2_INCLUDE_DIRS result variable
The plural-named non-cached result variable is needed to follow our
module conventions documented in `cmake-developer(7)`.  The variable is
also used to populate our ``BZip2::BZip2`` imported target include
directories, which was broken without this variable set.

Fixes: #18013
2018-05-22 09:56:32 -04:00
Brad King
a8bf1ea5b7 FindBZip2: Format result variable docs as definition list 2018-05-22 09:55:46 -04:00
Kitware Robot
e6a32f0525 CMake Nightly Date Stamp 2018-05-22 00:01:11 -04:00
Brad King
90e7103fc6 Merge topic 'pr.copy_data_check'
a203fcc63d cmake: Teach '-E tar' to report errors copying data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2075
2018-05-21 11:05:42 -04:00
Brad King
5915c5bf55 Merge topic 'cpackrpm-fix-docs'
78f0dcdcc9 CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docs
2ae2f0ca98 CPackRPM: Minor formatting cleanup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2070
2018-05-21 11:04:56 -04:00
Brad King
64ec064212 Merge topic 'eclipse-custom-content'
fd0da95f63 Eclipse: Add property to include additional contents in .cproject file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2088
2018-05-21 11:04:04 -04:00
Brad King
7b42ffce09 Merge topic 'PDBDirectoryGenExpression'
79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2083
2018-05-21 11:02:42 -04:00
Marian Klymov
79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property
Fixes: #16365
2018-05-21 11:00:12 -04:00
Brad King
963a33f4a8 Merge topic 'vs-remove-stream'
790fc415b1 cmVisualStudio10TargetGenerator: remove BuildFileStream member

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2082
2018-05-21 10:58:53 -04:00
Brad King
722056372e Merge topic 'update-curl'
3e913b819d Merge branch 'upstream-curl' into update-curl
d431136e02 curl 2018-05-15 (cb013830)
f3c73b878c curl: Update script to get curl 7.60.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2091
2018-05-21 09:53:06 -04:00
Brad King
4d6f4500df Merge topic 'update-kwsys'
b730097788 Merge branch 'upstream-KWSys' into update-kwsys
1f52cb087a KWSys 2018-05-18 (5357cfc4)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2090
2018-05-21 09:52:08 -04:00
Kitware Robot
e5463ec917 CMake Nightly Date Stamp 2018-05-21 00:01:05 -04:00
Kitware Robot
32cf27ada5 CMake Nightly Date Stamp 2018-05-20 00:01:08 -04:00
Kitware Robot
76affcb6b4 CMake Nightly Date Stamp 2018-05-19 00:01:07 -04:00
Brad King
68be3618dc Merge topic 'clang-format-version'
8cfc45f6bd clang-format: Explicitly require version 3.8 of the tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2086
2018-05-18 11:10:53 -04:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -04:00
Curl Upstream
d431136e02 curl 2018-05-15 (cb013830)
Code extracted from:

    https://github.com/curl/curl.git

at commit cb013830383f1ccc9757aba36bc32df5ec281c02 (curl-7_60_0).
2018-05-18 10:16:12 -04:00
Brad King
f3c73b878c curl: Update script to get curl 7.60.0 2018-05-18 10:15:46 -04:00
Melanie Cappelaere
fd0da95f63 Eclipse: Add property to include additional contents in .cproject file
Similar to ECLIPSE_EXTRA_NATURES which can be used to add a third party
nature to the .project, this property offers the possibility to inject
third party contents into the .cproject.

An example of where this is useful is MCUXpresso. This is an IDE based
on Eclipse. Compiling through CMake generated Eclipse projects works
fine by using a custom toolchain. However, in order to be able to debug
using such a project, an extra storageModule specific to the target
board is needed in the cproject.
2018-05-18 10:12:19 -04:00
Ruslan Baratov
a203fcc63d cmake: Teach '-E tar' to report errors copying data
The `copy_data` function checks for errors but the caller ignored
them.  Simplify its return type and add a check to the caller.
2018-05-18 10:04:18 -04:00
Brad King
b730097788 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-05-18 (5357cfc4)
2018-05-18 09:52:13 -04:00
KWSys Upstream
1f52cb087a KWSys 2018-05-18 (5357cfc4)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 5357cfc4af0cbef4c78df5834ff0440cee3148d1 (master).

Upstream Shortlog
-----------------

Peter Wu (1):
      898dc6b9 SystemTools: Fix GetLineFromStream to avoid libc++ bug on OS X 10.7
2018-05-18 09:52:12 -04:00
Brad King
8cfc45f6bd clang-format: Explicitly require version 3.8 of the tool
Versions of clang-format newer than 3.8 produce different output.
Our source code guide says that version 3.8 exactly must be used.
Update the comment in our `.clang-format` config file accordingly.
Add a check to our formatting script to verify the version.
Also update its tool search to look for the explicitly-named
3.8 variant first.
2018-05-18 09:19:10 -04:00
Kitware Robot
4eea43fce7 CMake Nightly Date Stamp 2018-05-18 00:01:05 -04:00
Brad King
be1f9c9602 Merge branch 'release-3.11' 2018-05-17 10:58:07 -04:00
Brad King
519427e32c CMake 3.11.2 v3.11.2 2018-05-17 09:07:43 -04:00