Commit Graph

95 Commits

Author SHA1 Message Date
Brad King 3744bd0a0a Merge topic 'xcodescheme2'
413b71485a Xcode: Create Xcode schemes per target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3098
2019-03-22 09:16:02 -04:00
Harry Mallon 413b71485a Xcode: Create Xcode schemes per target 2019-03-21 16:50:41 +00:00
Kyle Edwards 8c0b7aa17d Merge topic 'cmake--install'
73f23d1e00 cmake: add '--install <dir>' option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Acked-by: Bartosz <gang65@poczta.onet.pl>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Rejected-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !3069
2019-03-19 13:39:18 -04:00
Jiang Yi 73f23d1e00 cmake: add '--install <dir>' option
Fixes: #19023
2019-03-17 01:31:25 +08:00
Harry Mallon 40be48f890 XCode: Add scheme option XCODE_SCHEME_DEBUG_AS_ROOT 2019-03-11 13:30:35 +00:00
Brad King 214fcefa52 Remove now-unused code once used for MIPSpro on IRIX
In commit beb991110d (Remove now-unused code once used on IRIX,
2019-01-11, v3.14.0-rc1~167^2) we removed remnants of IRIX support.
Also remove remnants of MIPSpro compiler support.
2019-02-21 11:12:51 -05:00
Andrew Paprocki a080914274 Fortran: Add compiler ID/Version generator expressions
Adds `Fortran_COMPILER_ID` and `Fortran_COMPILER_VERSION` generator
expression support to match equivalent `C_COMPILER_ID`,
`CXX_COMPILER_ID`, `C_COMPILER_VERSION`, and `CXX_COMPILER_VERSION`
support.

This is very helpful in the case where the C/C++ compiler suite is a
different type of compiler from the platform Fortran compiler and
projects use generator expressions to assign compiler flags and
definitions.  (e.g. `GNU` C/C++ and `SunPro` Fortran on Linux)
2019-01-18 08:56:13 -05:00
Ben Boeckel 261ae28ccd Help: fix typo for CTEST_CUSTOM_TESTS_IGNORE
In commit v3.4.0-rc1~57^2 (Help: document CTEST_CUSTOM_* variables,
2015-09-17), the CTEST_CUSTOM_TESTS_IGNORE variable was documented with
a typo.
2019-01-02 15:42:33 -05:00
Wouter Klouwen 19d86e26e3 ExternalProject: add LOG_OUTPUT_ON_FAILURE option
This option only has an effect if at least one of the other LOG_<step>
options is enabled.  If an error occurs for a step which has logging to
file enabled, that step's output will be printed to the console.  For
cases where a large amount of output is recorded, just the end of that
output may be printed to the console.
2018-12-21 07:52:08 +11: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
Wouter Klouwen 7ddc9e353b ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderr
In some circumstances the user of ExternalProject may not desire the
split log files for stdout and stderr. In particular with a project has
many errors it can be difficult to correlate the output error with the
command that it resulted from.

This commit adds the LOG_MERGED_STDOUTERR option that when enabled
outputs into a unified <name>-<step>.log for each step. If disabled it
will default to the previous behaviour of <name>-<step>-out.log and
<name>-<step>-err.log.
2018-10-19 15:32:51 +01:00
Wouter Klouwen b6f6cac378 ExternalProject: add LOG_DIR option that allows overriding of log location
In some situations it can be helpful to separate out the location of the
log files from the location of the stamp files. For instance if you have
a continuous integration that exposes the location where log files are
stored.

This commit adds an option that allows a user to override the default
behaviour of putting the log files in STAMP_DIR called LOG_DIR. The
previous behaviour of putting the log files into the STAMP_DIR applies
if LOG_DIR is not specified.
2018-10-19 15:32:51 +01:00
Brad King 3aa258db0e Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-18 (64ff4bd7)
2018-10-18 07:53:55 -04:00
Patrick Boettcher 7330a89f56 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2018-10-10 (ac1957fb)
2018-10-10 07:17:08 -04:00
Betsy McPhail 5fc11b34e4 Help: Add CAPTURE_CMAKE_ERROR to ctest_submit and ctest_update documentation
Also, added CAPTURE_CMAKE_ERROR to vim synax file for ctest_submit,
ctest_update and ctest_memcheck.
2018-08-28 21:09:53 -04:00
Jeff Kowalski 67ae6da331 cmake-mode.el: Fix "unescaped character literals" warning
Emacs 27.0 warns

    Loading ‘cmake-mode’: unescaped character literals `?(', `?)' detected!

during byte-compilation of cmake-mode.el The new warning was added in
emacs commit c2bbdc3316 (Warn about missing backslashes during load).

Add backslashes to escape the literals.
2018-07-09 10:06:33 -04:00
Luz Paz 3ab7bf8285 Various typo fixes
Some are user-facing. Others are source comments.
2018-01-04 06:52:01 +11:00
Patrick Boettcher 8a6cdbae16 update vim-syntax to latest cmake-commit 2017-10-31 07:44:53 +01:00
Brad King 358ceee5d8 Merge topic 'curl_netrc_options'
d45aa38a Add dev notes for topic 'curl_netrc_options'
60c272b6 ExternalProject: Add support for NETRC and NETRC_FILE suboption
754e39dd Add testcases for file(DOWNLOAD|UPLOAD) netrc options
5d67e902 file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboption

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1376
2017-10-19 09:27:43 -04:00
Shane Parris 60c272b69a ExternalProject: Add support for NETRC and NETRC_FILE suboption 2017-10-18 15:21:43 -04:00
Shane Parris 5d67e9025d file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboption 2017-10-18 15:21:42 -04:00
Gregor Jasny 5de37a4a64 cmake: Add --open option for IDE generators 2017-10-13 21:28:34 +02:00
Kevin M. Godby 49dab3ebfb VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties.
The VS_SHADER_OUTPUT_HEADER_FILE property is the name of the generated
header file containing the object code of the shader.

The VS_SHADER_VARIABLE_NAME property is the name of the variable
containing the object code in the above header file.

Signed-off-by: Kevin M. Godby <kevin@godby.org>
2017-09-27 07:56:09 -04:00
Brad King f5338f799d Merge topic 'revert-vim-no-tabs'
0d543589 vim: Remove default setting of expandtab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Maurice <m-ou.se@m-ou.se>
Merge-request: !1273
2017-09-18 08:52:12 -04:00
Maarten de Vries 0d543589b9 vim: Remove default setting of expandtab
An update from vim-cmake-syntax by commit v3.9.0-rc1~167^2^2
(vim-cmake-syntax 2017-05-02, 2017-05-02) brought in a change to set
`expandtab` in CMake language files.  This should be a per-project or
per-user choice instead, so drop the setting.
2017-09-18 08:41:53 -04:00
Patrick Boettcher 84d6735611 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2017-08-30 (40f5f4f3)
2017-08-30 22:40:38 +02:00
Betsy McPhail d385962419 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
The specified LABELS will be passed down to subdirectories as well as
any targets or tests in the directory.
2017-07-10 16:25:18 -04:00
Betsy McPhail d08ec4d25a Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable
Use this variable to specify a list of labels that will be reported to
CDash as subprojects.
2017-07-10 16:25:18 -04:00
Pavel Solodovnikov 85b52a04bd include_guard: add vim syntax highlighting rules 2017-06-22 10:54:01 +03:00
Florian Maushart e7869e80ce cmake_host_system_information: Add more keywords
Extend the `cmake_host_system_information()` command to add processor
identification keywords.
2017-06-05 13:51:30 -04:00
Patrick Boettcher 0d8273fa32 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2017-05-02 (15526199)
2017-05-02 17:34:53 +02:00
Christian Pfeiffer 2a207aaca1 separgs: Add a NATIVE_COMMAND mode 2017-04-26 20:34:06 +02:00
John Donoghue 7788db9c4e cmake.m4: do not set _XXXFLAGS or _LIBS var if already set
* Auxiliary/cmake.m4 (CMAKE_FIND_PACKAGE): change var tests from -n to -z
  to check if var is already set before calling cmake

Fixes: #14460, #16663
2017-02-23 07:16:16 -05:00
Jamie Snape 0618ddf6b1 Add properties to run the cpplint style checker with the compiler
Create a `<LANG>_CPPLINT` target property (initialized by a
`CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker
command line to be run along with the compiler.
2017-01-23 14:47:13 -05:00
Konstantin Podsvirov da0e3f9096 install: Configurable DESTINATION for the cmake.m4 file
The DESTINATION changed from share/aclocal to ${CMAKE_XDGDATA_DIR}/aclocal.
2016-11-15 23:17:59 +03:00
Betsy McPhail 3a523eec78 ctest_memcheck: Add DEFECT_COUNT option to capture defect count 2016-11-09 15:34:07 -05:00
Brad King 86578eccf2 Simplify CMake per-source license notices
Per-source copyright/license notice headers that spell out copyright holder
names and years are hard to maintain and often out-of-date or plain wrong.
Precise contributor information is already maintained automatically by the
version control tool.  Ultimately it is the receiver of a file who is
responsible for determining its licensing status, and per-source notices are
merely a convenience.  Therefore it is simpler and more accurate for
each source to have a generic notice of the license name and references to
more detailed information on copyright holders and full license terms.

Our `Copyright.txt` file now contains a list of Contributors whose names
appeared source-level copyright notices.  It also references version control
history for more precise information.  Therefore we no longer need to spell
out the list of Contributors in each source file notice.

Replace CMake per-source copyright/license notice headers with a short
description of the license and links to `Copyright.txt` and online information
available from "https://cmake.org/licensing".  The online URL also handles
cases of modules being copied out of our source into other projects, so we
can drop our notices about replacing links with full license text.

Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority
of the replacements mechanically.  Manually fix up shebang lines and trailing
newlines in a few files.  Manually update the notices in a few files that the
script does not handle.
2016-09-27 15:14:44 -04:00
Ruslan Baratov 0f424c3d07 ExternalProject: Add HTTP_HEADER 2016-09-19 16:05:12 +03:00
Ruslan Baratov e1ca117332 ExternalProject: Add HTTP_{USERNAME,PASSWORD} 2016-09-15 07:52:54 +03:00
Brad King 25c01cf0b0 Aux: Install vim-cmake-syntax files with CMake 2016-08-17 09:11:47 -04:00
Brad King e3ac68cfbf Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntax
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2016-08-16 (e782679c)
2016-08-17 09:11:19 -04:00
Brad King f21a823598 Aux: Drop vim files prior to import of third-party version 2016-08-17 09:11:13 -04:00
Sylvain Joubert fe7f117ad2 bash-completion: Fix cmake -E lookup
In case of long '<command> <args...>' the description text is wrapped
and indented on the next line.
Avoid taking these lines into account by explicitly requiring the third
character to be a non-space.
2016-08-05 08:54:09 -04:00
Brad King 5f99e61cad Merge topic 'emacs-mode-compilation-warning'
82388543 cmake-mode.el: Replace use of obsolete function (since Emacs 24.3).
ca684ccb cmake-mode.el: Fix byte-compilation warnings.
2016-08-01 15:15:39 -04:00
Jostein Kjønigsen 82388543d2 cmake-mode.el: Replace use of obsolete function (since Emacs 24.3). 2016-08-01 15:13:43 -04:00
Jostein Kjønigsen ca684ccb46 cmake-mode.el: Fix byte-compilation warnings. 2016-07-26 14:41:02 +02:00
Ben Boeckel cd7ed47c4a Aux: highlight commands using Function
These are closer to functions than anything else. Also change the other
groups which were highlighted with Function to other groups.
2016-07-22 12:33:23 -04:00
Ben Boeckel bca8be583e Aux: sort the highlighting list 2016-07-22 12:32:40 -04:00
Ben Boeckel 7decbe8ffb Aux: highlight CMAKE_{CMAKE,CPACK}_COMMAND variables 2016-07-22 12:32:05 -04:00
Ben Boeckel 2b57b13920 Aux: highlight modules using Include
They are closer to Include than generic preprocessor lines.
2016-07-22 12:31:26 -04:00